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

13 files changed, 10500 insertions, 19612 deletions

diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c
index 17f2ef2..bd25726 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.c
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.c
@@ -1,4 +1,4 @@
-/* GalleryConnector.c generated by valac 0.36.6, the Vala compiler
+/* GalleryConnector.c generated by valac 0.40.4, the Vala compiler
  * generated from GalleryConnector.vala, do not modify */
 
 /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -33,6 +34,11 @@
 typedef struct _ShotwellPublishingGallery3 ShotwellPublishingGallery3;
 typedef struct _ShotwellPublishingGallery3Class ShotwellPublishingGallery3Class;
 typedef struct _ShotwellPublishingGallery3Private ShotwellPublishingGallery3Private;
+enum  {
+	SHOTWELL_PUBLISHING_GALLERY3_0_PROPERTY,
+	SHOTWELL_PUBLISHING_GALLERY3_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_publishing_gallery3_properties[SHOTWELL_PUBLISHING_GALLERY3_NUM_PROPERTIES];
 
 #define TYPE_GALLERY3_SERVICE (gallery3_service_get_type ())
 #define GALLERY3_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GALLERY3_SERVICE, Gallery3Service))
@@ -45,6 +51,11 @@ typedef struct _Gallery3Service Gallery3Service;
 typedef struct _Gallery3ServiceClass Gallery3ServiceClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _Gallery3ServicePrivate Gallery3ServicePrivate;
+enum  {
+	GALLERY3_SERVICE_0_PROPERTY,
+	GALLERY3_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* gallery3_service_properties[GALLERY3_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER (publishing_gallery3_gallery_publisher_get_type ())
@@ -217,6 +228,11 @@ typedef struct _PublishingGallery3GalleryPublisherPrivate PublishingGallery3Gall
 
 typedef struct _PublishingGallery3PublishingOptionsPane PublishingGallery3PublishingOptionsPane;
 typedef struct _PublishingGallery3PublishingOptionsPaneClass PublishingGallery3PublishingOptionsPaneClass;
+enum  {
+	PUBLISHING_GALLERY3_GALLERY_PUBLISHER_0_PROPERTY,
+	PUBLISHING_GALLERY3_GALLERY_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_gallery_publisher_properties[PUBLISHING_GALLERY3_GALLERY_PUBLISHER_NUM_PROPERTIES];
 
 #define PUBLISHING_GALLERY3_CREDENTIALS_PANE_TYPE_MODE (publishing_gallery3_credentials_pane_mode_get_type ())
 
@@ -241,13 +257,18 @@ typedef struct _PublishingGallery3Uploader PublishingGallery3Uploader;
 typedef struct _PublishingGallery3UploaderClass PublishingGallery3UploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
 typedef struct _PublishingGallery3PublishingOptionsPanePrivate PublishingGallery3PublishingOptionsPanePrivate;
+enum  {
+	PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_publishing_options_pane_properties[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
 #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 enum  {
 	PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
 	PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingGallery3PublishingParametersPrivate PublishingGallery3PublishingParametersPrivate;
 typedef struct _PublishingGallery3ParamSpecPublishingParameters PublishingGallery3ParamSpecPublishingParameters;
 typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3CredentialsPanePrivate;
@@ -262,18 +283,29 @@ typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3Crede
 typedef struct _PublishingGallery3CredentialsGrid PublishingGallery3CredentialsGrid;
 typedef struct _PublishingGallery3CredentialsGridClass PublishingGallery3CredentialsGridClass;
 enum  {
+	PUBLISHING_GALLERY3_CREDENTIALS_PANE_0_PROPERTY,
+	PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_credentials_pane_properties[PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_PROPERTIES];
+enum  {
 	PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL,
 	PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL,
-	PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL
+	PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_SIGNALS
 };
-static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingGallery3CredentialsGridPrivate PublishingGallery3CredentialsGridPrivate;
 enum  {
+	PUBLISHING_GALLERY3_CREDENTIALS_GRID_0_PROPERTY,
+	PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY,
+	PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_PROPERTIES];
+enum  {
 	PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL,
 	PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL,
-	PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL
+	PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_SIGNALS
 };
-static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL] = {0};
+static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_SIGNALS] = {0};
 typedef struct _PublishingGallery3SessionPrivate PublishingGallery3SessionPrivate;
 typedef struct _PublishingGallery3UploaderPrivate PublishingGallery3UploaderPrivate;
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
@@ -661,33 +693,42 @@ static gpointer publishing_gallery3_uploader_parent_class = NULL;
 #define WEBSITE_URL "https://github.com/sappjw/shotwell-gallery3"
 GType shotwell_publishing_gallery3_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3Private))
-enum  {
-	SHOTWELL_PUBLISHING_GALLERY3_DUMMY_PROPERTY
-};
 ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file);
-ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file);
+ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type,
+                                                                    GFile* module_file);
 Gallery3Service* gallery3_service_new (GFile* resource_directory);
-Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory);
+Gallery3Service* gallery3_service_construct (GType object_type,
+                                             GFile* resource_directory);
 GType gallery3_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);
 static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* base);
 static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base,
+                                                                  int* result_length1);
 static void shotwell_publishing_gallery3_finalize (GObject * obj);
-enum  {
-	GALLERY3_SERVICE_DUMMY_PROPERTY
-};
 #define GALLERY3_SERVICE_ICON_FILENAME "gallery3.png"
-static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                    gint min_host_interface,
+                                                    gint max_host_interface);
 static const gchar* gallery3_service_real_get_id (SpitPluggable* base);
 static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* base);
-static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length);
-static void gallery3_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void gallery3_service_real_get_info (SpitPluggable* base,
+                                     SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self,
+                              int length);
+static void gallery3_service_real_activation (SpitPluggable* base,
+                                       gboolean enabled);
+static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base,
+                                                                 SpitPublishingPluginHost* host);
+PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service,
+                                                                               SpitPublishingPluginHost* host);
+PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type,
+                                                                                     SpitPublishingService* service,
+                                                                                     SpitPublishingPluginHost* host);
 GType publishing_gallery3_gallery_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_media (SpitPublishingService* base);
 static void gallery3_service_finalize (GObject * obj);
@@ -701,123 +742,176 @@ static void gallery3_service_finalize (GObject * obj);
 #define PUBLISHING_GALLERY3_REST_PATH "/index.php/rest"
 gpointer publishing_gallery3_album_ref (gpointer instance);
 void publishing_gallery3_album_unref (gpointer instance);
-GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_gallery3_value_set_album (GValue* value, gpointer v_object);
-void publishing_gallery3_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_gallery3_param_spec_album (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void publishing_gallery3_value_set_album (GValue* value,
+                                          gpointer v_object);
+void publishing_gallery3_value_take_album (GValue* value,
+                                           gpointer v_object);
 gpointer publishing_gallery3_value_get_album (const GValue* value);
 GType publishing_gallery3_album_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_ALBUM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_ALBUM, PublishingGallery3AlbumPrivate))
-enum  {
-	PUBLISHING_GALLERY3_ALBUM_DUMMY_PROPERTY
-};
 PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection);
-PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection);
-static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value);
+PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type,
+                                                              JsonObject* collection);
+static void publishing_gallery3_album_set_title (PublishingGallery3Album* self,
+                                          const gchar* value);
+static void publishing_gallery3_album_set_name (PublishingGallery3Album* self,
+                                         const gchar* value);
+static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self,
+                                               const gchar* value);
+static void publishing_gallery3_album_set_url (PublishingGallery3Album* self,
+                                        const gchar* value);
+static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self,
+                                             gboolean value);
 gchar* publishing_gallery3_strip_session_url (const gchar* url);
 const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self);
-static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value);
+static void publishing_gallery3_album_set_path (PublishingGallery3Album* self,
+                                         const gchar* value);
 const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self);
 const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self);
 const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self);
-static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value);
+static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self,
+                                            const gchar* value);
 const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self);
 const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self);
 gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self);
 static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj);
 GType publishing_gallery3_base_gallery_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_GALLERY3_BASE_GALLERY_TRANSACTION_DUMMY_PROPERTY
-};
 GType publishing_gallery3_session_get_type (void) G_GNUC_CONST;
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method);
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method);
-JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, GError** error);
+PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session,
+                                                                                            const gchar* endpoint_url,
+                                                                                            const gchar* item_path,
+                                                                                            PublishingRESTSupportHttpMethod method);
+PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type,
+                                                                                                  PublishingGallery3Session* session,
+                                                                                                  const gchar* endpoint_url,
+                                                                                                  const gchar* item_path,
+                                                                                                  PublishingRESTSupportHttpMethod method);
+JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self,
+                                                                      GError** error);
 static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj);
 GType publishing_gallery3_key_fetch_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransactionPrivate))
-enum  {
-	PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password);
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password);
+PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session,
+                                                                                      const gchar* url,
+                                                                                      const gchar* username,
+                                                                                      const gchar* password);
+PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type,
+                                                                                            PublishingGallery3Session* session,
+                                                                                            const gchar* url,
+                                                                                            const gchar* username,
+                                                                                            const gchar* password);
 gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self);
 static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj);
 GType publishing_gallery3_gallery_request_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_GALLERY3_GALLERY_REQUEST_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method);
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method);
+PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session,
+                                                                                                  const gchar* item,
+                                                                                                  PublishingRESTSupportHttpMethod method);
+PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type,
+                                                                                                        PublishingGallery3Session* session,
+                                                                                                        const gchar* item,
+                                                                                                        PublishingRESTSupportHttpMethod method);
 const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self);
 const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self);
 GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_GALLERY3_GET_ALBUM_UR_LS_TRANSACTION_DUMMY_PROPERTY
-};
 PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session);
-PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session);
-gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, int* result_length1);
-static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value);
+PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type,
+                                                                                                      PublishingGallery3Session* session);
+gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self,
+                                                                        int* result_length1);
+static void _vala_array_add2 (gchar** * array,
+                       int* length,
+                       int* size,
+                       gchar* value);
 GType publishing_gallery3_get_albums_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransactionPrivate))
-enum  {
-	PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start);
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start);
-static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1);
-gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1);
-static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value);
+PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session,
+                                                                                        gchar** _album_urls,
+                                                                                        int _album_urls_length1,
+                                                                                        guint start);
+PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type,
+                                                                                              PublishingGallery3Session* session,
+                                                                                              gchar** _album_urls,
+                                                                                              int _album_urls_length1,
+                                                                                              guint start);
+static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+                                                                gchar** value,
+                                                                int value_length1);
+gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+                                                                   int* result_length1);
+static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self,
+                                                               guint value);
 guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self);
-static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value);
-static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value);
-PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error);
-static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value);
-static gchar** _vala_array_dup2 (gchar** self, int length);
+static void _vala_array_add3 (gchar** * array,
+                       int* length,
+                       int* size,
+                       gchar* value);
+static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self,
+                                                               gboolean value);
+PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self,
+                                                                                 int* result_length1,
+                                                                                 GError** error);
+static void _vala_array_add4 (PublishingGallery3Album** * array,
+                       int* length,
+                       int* size,
+                       PublishingGallery3Album* value);
+static gchar** _vala_array_dup2 (gchar** self,
+                          int length);
 gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self);
 static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj);
 GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_GALLERY3_GALLERY_GET_TAG_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name);
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name);
+PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session,
+                                                                                                 const gchar* tag_name);
+PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type,
+                                                                                                       PublishingGallery3Session* session,
+                                                                                                       const gchar* tag_name);
 static void _vala_JsonNode_free (JsonNode* self);
 gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self);
 GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, PublishingGallery3GalleryGetItemTagsURLsTransactionPrivate))
-enum  {
-	PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url);
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url);
+PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session,
+                                                                                                                      const gchar* item_url);
+PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type,
+                                                                                                                            PublishingGallery3Session* session,
+                                                                                                                            const gchar* item_url);
 gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self);
 static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj);
 GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_GALLERY3_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url);
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url);
+PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session,
+                                                                                                                          const gchar* item_tags_path,
+                                                                                                                          const gchar* tag_url,
+                                                                                                                          const gchar* item_url);
+PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type,
+                                                                                                                                PublishingGallery3Session* session,
+                                                                                                                                const gchar* item_tags_path,
+                                                                                                                                const gchar* tag_url,
+                                                                                                                                const gchar* item_url);
 GType publishing_gallery3_gallery_album_create_transaction_get_type (void) G_GNUC_CONST;
 gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance);
 void publishing_gallery3_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name,
+                                                                  const gchar* nick,
+                                                                  const gchar* blurb,
+                                                                  GType object_type,
+                                                                  GParamFlags flags);
+void publishing_gallery3_value_set_publishing_parameters (GValue* value,
+                                                          gpointer v_object);
+void publishing_gallery3_value_take_publishing_parameters (GValue* value,
+                                                           gpointer v_object);
 gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* value);
 GType publishing_gallery3_publishing_parameters_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, PublishingGallery3GalleryAlbumCreateTransactionPrivate))
-enum  {
-	PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters);
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters);
-static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value);
+PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session,
+                                                                                                           PublishingGallery3PublishingParameters* parameters);
+PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type,
+                                                                                                                 PublishingGallery3Session* session,
+                                                                                                                 PublishingGallery3PublishingParameters* parameters);
+static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self,
+                                                                          PublishingGallery3PublishingParameters* value);
 const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self);
 const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self);
 gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self);
@@ -825,26 +919,30 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create
 static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj);
 GType publishing_gallery3_gallery_upload_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransactionPrivate))
-enum  {
-	PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session,
+                                                                                                PublishingGallery3PublishingParameters* parameters,
+                                                                                                SpitPublishingPublishable* publishable);
+PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type,
+                                                                                                      PublishingGallery3Session* session,
+                                                                                                      PublishingGallery3PublishingParameters* parameters,
+                                                                                                      SpitPublishingPublishable* publishable);
 const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self);
 static void _g_free0_ (gpointer var);
 static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self);
-static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error);
+static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self,
+                                                                             const gchar* tag_url,
+                                                                             GError** error);
 static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self);
-static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag);
-static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error);
+static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self,
+                                                                   const gchar* tag);
+static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self,
+                                                                         GError** error);
 gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self);
-static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                                  GError** error);
 static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
 GType publishing_gallery3_publishing_options_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisherPrivate))
-enum  {
-	PUBLISHING_GALLERY3_GALLERY_PUBLISHER_DUMMY_PROPERTY
-};
 #define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG _ ("\n" \
 "\n" \
 "The file “%s” may not be supported by or may be too large for this ins" \
@@ -860,106 +958,221 @@ gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3Gall
 static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self);
 gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self);
 gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self);
-void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key);
+void publishing_gallery3_session_authenticate (PublishingGallery3Session* self,
+                                               const gchar* gallery_url,
+                                               const gchar* username,
+                                               const gchar* key);
 static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self);
 static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base);
-void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key);
-void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url);
-void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username);
+void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self,
+                                                        const gchar* key);
+void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self,
+                                                            const gchar* url);
+void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self,
+                                                                 const gchar* username);
 gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self);
 static gboolean* _bool_dup (gboolean* self);
-void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata);
+void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self,
+                                                                          gboolean strip_metadata);
 gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self);
 static gint* _int_dup (gint* self);
-void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint);
+void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self,
+                                                                      gint constraint);
 gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self);
-void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels);
+void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self,
+                                                               gint pixels);
 static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self);
 static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
 GType publishing_gallery3_credentials_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode);
+static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self,
+                                                                     PublishingGallery3CredentialsPaneMode mode);
 gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self);
 void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self);
 GType publishing_gallery3_credentials_pane_get_type (void) G_GNUC_CONST;
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key);
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key);
+PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host,
+                                                                             PublishingGallery3CredentialsPaneMode mode,
+                                                                             const gchar* url,
+                                                                             const gchar* username,
+                                                                             const gchar* key);
+PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type,
+                                                                                   SpitPublishingPluginHost* host,
+                                                                                   PublishingGallery3CredentialsPaneMode mode,
+                                                                                   const gchar* url,
+                                                                                   const gchar* username,
+                                                                                   const gchar* key);
 static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self);
-static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password);
-static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender, const gchar* url, const gchar* uname, const gchar* password, const gchar* key, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password);
-static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start);
-static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username);
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels);
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels);
-static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters);
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, PublishingGallery3PublishingParameters* parameters, gpointer self);
+static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender,
+                                                                                                                 gpointer self);
+static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self,
+                                                                 const gchar* url,
+                                                                 const gchar* username,
+                                                                 const gchar* password);
+static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender,
+                                                                                                             const gchar* url,
+                                                                                                             const gchar* uname,
+                                                                                                             const gchar* password,
+                                                                                                             const gchar* key,
+                                                                                                             gpointer self);
+static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self,
+                                                             const gchar* url,
+                                                             const gchar* username,
+                                                             const gchar* password);
+static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self,
+                                                               PublishingRESTSupportTransaction* bad_txn,
+                                                               GError* err);
+static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                  GError* err,
+                                                                                                                  gpointer self);
+static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self,
+                                                                  PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                 gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self,
+                                                                      PublishingRESTSupportTransaction* bad_txn,
+                                                                      GError* err);
+static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                         GError* err,
+                                                                                                                         gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self,
+                                                                         PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                        gpointer self);
+static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self,
+                                                            gchar** album_urls,
+                                                            int album_urls_length1,
+                                                            guint start);
+static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self,
+                                                                 PublishingRESTSupportTransaction* bad_txn,
+                                                                 GError* err);
+static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                    GError* err,
+                                                                                                                    gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self,
+                                                                    PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                   gpointer self);
+static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self,
+                                                                            const gchar* url,
+                                                                            const gchar* username);
+PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host,
+                                                                                          const gchar* url,
+                                                                                          const gchar* username,
+                                                                                          PublishingGallery3Album** albums,
+                                                                                          int albums_length1,
+                                                                                          GtkBuilder* builder,
+                                                                                          gboolean strip_metadata,
+                                                                                          gint scaling_id,
+                                                                                          gint scaling_pixels);
+PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type,
+                                                                                                SpitPublishingPluginHost* host,
+                                                                                                const gchar* url,
+                                                                                                const gchar* username,
+                                                                                                PublishingGallery3Album** albums,
+                                                                                                int albums_length1,
+                                                                                                GtkBuilder* builder,
+                                                                                                gboolean strip_metadata,
+                                                                                                gint scaling_id,
+                                                                                                gint scaling_pixels);
+static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self,
+                                                                               PublishingGallery3PublishingParameters* parameters);
+static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender,
+                                                                                                                                    PublishingGallery3PublishingParameters* parameters,
+                                                                                                                                    gpointer self);
 static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self);
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters);
-static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters);
+static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender,
+                                                                                                                                  gpointer self);
+static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self,
+                                                            PublishingGallery3PublishingParameters* parameters);
+static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self,
+                                                                  PublishingRESTSupportTransaction* bad_txn,
+                                                                  GError* err);
+static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                     GError* err,
+                                                                                                                     gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self,
+                                                                     PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                    gpointer self);
+static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self,
+                                                       PublishingGallery3PublishingParameters* parameters);
 gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self);
 GType publishing_gallery3_uploader_get_type (void) G_GNUC_CONST;
-PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters);
-PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters);
-static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session,
+                                                              SpitPublishingPublishable** publishables,
+                                                              int publishables_length1,
+                                                              PublishingGallery3PublishingParameters* parameters);
+PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type,
+                                                                    PublishingGallery3Session* session,
+                                                                    SpitPublishingPublishable** publishables,
+                                                                    int publishables_length1,
+                                                                    PublishingGallery3PublishingParameters* parameters);
+static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self,
+                                                                PublishingRESTSupportBatchUploader* uploader,
+                                                                gint num_published);
+static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                        gint num_photos_published,
+                                                                                                                        gpointer self);
+static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self,
+                                                             PublishingRESTSupportBatchUploader* _uploader,
+                                                             GError* err);
+static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                  GError* err,
+                                                                                                                  gpointer self);
+static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self,
+                                                                     gint file_number,
+                                                                     gdouble completed_fraction);
+static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                        gdouble fraction_complete,
+                                                                                                        gpointer self);
 static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self);
 const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self);
-static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value);
-void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value);
+static void _vala_array_add5 (PublishingGallery3Album** * array,
+                       int* length,
+                       int* size,
+                       PublishingGallery3Album* value);
+void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self,
+                                                               const gchar* value);
 const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self);
 guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self);
 SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self);
 gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self);
 static void publishing_gallery3_gallery_publisher_finalize (GObject * obj);
 #define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
 #define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME ""
 #define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY "last-album"
-static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self, int length);
+static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self,
+                                            int length);
 static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                    gpointer self);
 static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                  gpointer self);
 static void publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                                   gpointer self);
 static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                                       gpointer self);
 static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                          gpointer self);
 static void publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                        gpointer self);
 static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                         gpointer self);
 PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title);
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title);
+PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type,
+                                                                                                          const gchar* album_title);
 PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path);
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path);
-void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value);
-void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value);
+PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type,
+                                                                                                               const gchar* album_path);
+void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self,
+                                                                          gint value);
+void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self,
+                                                                   gboolean value);
 static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self);
 static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self);
 void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self);
@@ -967,43 +1180,67 @@ static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (S
 static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (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_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure,
+                                                                              GValue * return_value,
+                                                                              guint n_param_values,
+                                                                              const GValue * param_values,
+                                                                              gpointer invocation_hint,
+                                                                              gpointer marshal_data);
 static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj);
 #define PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParametersPrivate))
-enum  {
-	PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
 static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void);
 static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct (GType object_type);
-static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value);
-static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value);
+static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self,
+                                                               const gchar* value);
+static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self,
+                                                                const gchar* value);
 const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self);
-static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value);
+static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self,
+                                                                 const gchar* value);
 static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj);
 GType publishing_gallery3_credentials_grid_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_GALLERY3_CREDENTIALS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPanePrivate))
-enum  {
-	PUBLISHING_GALLERY3_CREDENTIALS_PANE_DUMMY_PROPERTY
-};
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder);
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder);
+PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host,
+                                                                             PublishingGallery3CredentialsPaneMode mode,
+                                                                             const gchar* url,
+                                                                             const gchar* username,
+                                                                             const gchar* key,
+                                                                             GtkBuilder* builder);
+PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type,
+                                                                                   SpitPublishingPluginHost* host,
+                                                                                   PublishingGallery3CredentialsPaneMode mode,
+                                                                                   const gchar* url,
+                                                                                   const gchar* username,
+                                                                                   const gchar* key,
+                                                                                   GtkBuilder* builder);
 GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self);
 void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self);
-void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, const gchar* url, const gchar* uname, const gchar* password, const gchar* key);
+void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self,
+                                                        const gchar* url,
+                                                        const gchar* uname,
+                                                        const gchar* password,
+                                                        const gchar* key);
 static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self);
-static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender, const gchar* url, const gchar* username, const gchar* password, const gchar* key, gpointer self);
+static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender,
+                                                                                                        gpointer self);
+static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender,
+                                                                                                    const gchar* url,
+                                                                                                    const gchar* username,
+                                                                                                    const gchar* password,
+                                                                                                    const gchar* key,
+                                                                                                    gpointer self);
 void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self);
 static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure,
+                                                                GValue * return_value,
+                                                                guint n_param_values,
+                                                                const GValue * param_values,
+                                                                gpointer invocation_hint,
+                                                                gpointer marshal_data);
 static void publishing_gallery3_credentials_pane_finalize (GObject * obj);
 #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGridPrivate))
-enum  {
-	PUBLISHING_GALLERY3_CREDENTIALS_GRID_DUMMY_PROPERTY,
-	PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY
-};
 #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE _ ("Enter the URL for your Gallery3 site and the username and password (or" \
 " API key) for your Gallery3 account.")
 #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE _ ("The username and password or API key were incorrect. To try again, re-" \
@@ -1011,94 +1248,115 @@ enum  {
 #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE _ ("The URL entered does not appear to be the main directory of a Gallery3" \
 " instance. Please make sure you typed it correctly and it does not hav" \
 "e any trailing components (e.g., index.php).")
-static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value);
+static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self,
+                                                           GtkGrid* value);
 static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self);
-static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                            gpointer self);
 static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self);
-static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                         gpointer self);
 static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self);
-static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                       gpointer self);
 static void publishing_gallery3_credentials_grid_finalize (GObject * obj);
-static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object,
+                                                              guint property_id,
+                                                              GValue * value,
+                                                              GParamSpec * pspec);
+static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object,
+                                                              guint property_id,
+                                                              const GValue * value,
+                                                              GParamSpec * pspec);
 #define PUBLISHING_GALLERY3_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3SessionPrivate))
-enum  {
-	PUBLISHING_GALLERY3_SESSION_DUMMY_PROPERTY
-};
 static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value);
-static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value);
-static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value);
+static void publishing_gallery3_session_set_url (PublishingGallery3Session* self,
+                                          const gchar* value);
+static void publishing_gallery3_session_set_username (PublishingGallery3Session* self,
+                                               const gchar* value);
+static void publishing_gallery3_session_set_key (PublishingGallery3Session* self,
+                                          const gchar* value);
 static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj);
 #define PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3UploaderPrivate))
-enum  {
-	PUBLISHING_GALLERY3_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                                        SpitPublishingPublishable* publishable);
 static void publishing_gallery3_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_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 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if ((*length) == (*size)) {
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 1020 "GalleryConnector.c"
+#line 1274 "GalleryConnector.c"
 	}
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[(*length)++] = value;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[*length] = NULL;
-#line 1026 "GalleryConnector.c"
+#line 1280 "GalleryConnector.c"
 }
 
 
-ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file) {
+ShotwellPublishingGallery3*
+shotwell_publishing_gallery3_construct (GType object_type,
+                                        GFile* module_file)
+{
 	ShotwellPublishingGallery3 * self = NULL;
 	GFile* resource_directory = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_;
-	SpitPluggable** _tmp2_;
-	gint _tmp2__length1;
-	Gallery3Service* _tmp3_;
+	SpitPluggable** _tmp1_;
+	gint _tmp1__length1;
+	Gallery3Service* _tmp2_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (ShotwellPublishingGallery3*) g_object_new (object_type, NULL);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = module_file;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_file_get_parent (_tmp0_);
+	_tmp0_ = g_file_get_parent (module_file);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	resource_directory = _tmp1_;
+	resource_directory = _tmp0_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = self->priv->pluggables;
+	_tmp1_ = self->priv->pluggables;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2__length1 = self->priv->pluggables_length1;
+	_tmp1__length1 = self->priv->pluggables_length1;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = gallery3_service_new (resource_directory);
+	_tmp2_ = gallery3_service_new (resource_directory);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (resource_directory);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 1060 "GalleryConnector.c"
+#line 1314 "GalleryConnector.c"
 }
 
 
-ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file) {
+ShotwellPublishingGallery3*
+shotwell_publishing_gallery3_new (GFile* module_file)
+{
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return shotwell_publishing_gallery3_construct (TYPE_SHOTWELL_PUBLISHING_GALLERY3, module_file);
-#line 1067 "GalleryConnector.c"
+#line 1323 "GalleryConnector.c"
 }
 
 
-static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_publishing_gallery3_real_get_module_name (SpitModule* base)
+{
 	ShotwellPublishingGallery3 * self;
 	const gchar* result = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1107,11 +1365,13 @@ static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModul
 	result = _ ("Gallery3 publishing module");
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1080 "GalleryConnector.c"
+#line 1338 "GalleryConnector.c"
 }
 
 
-static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_publishing_gallery3_real_get_version (SpitModule* base)
+{
 	ShotwellPublishingGallery3 * self;
 	const gchar* result = NULL;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1120,11 +1380,13 @@ static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* b
 	result = G3_VERSION;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1093 "GalleryConnector.c"
+#line 1353 "GalleryConnector.c"
 }
 
 
-static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_publishing_gallery3_real_get_id (SpitModule* base)
+{
 	ShotwellPublishingGallery3 * self;
 	const gchar* result = NULL;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1133,11 +1395,14 @@ static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base)
 	result = "org.yorba.shotwell.sharing.gallery3";
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1106 "GalleryConnector.c"
+#line 1368 "GalleryConnector.c"
 }
 
 
-static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base,
+                                                  int* result_length1)
+{
 	ShotwellPublishingGallery3 * self;
 	SpitPluggable** result = NULL;
 	SpitPluggable** _tmp0_;
@@ -1158,28 +1423,32 @@ static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitMod
 	if (result_length1) {
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*result_length1 = _tmp1__length1;
-#line 1131 "GalleryConnector.c"
+#line 1396 "GalleryConnector.c"
 	}
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = _tmp1_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1137 "GalleryConnector.c"
+#line 1402 "GalleryConnector.c"
 }
 
 
-static void shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3Class * klass) {
+static void
+shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3Class * klass)
+{
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	shotwell_publishing_gallery3_parent_class = g_type_class_peek_parent (klass);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (ShotwellPublishingGallery3Private));
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_gallery3_finalize;
-#line 1148 "GalleryConnector.c"
+#line 1415 "GalleryConnector.c"
 }
 
 
-static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleIface * iface)
+{
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	shotwell_publishing_gallery3_spit_module_parent_iface = g_type_interface_peek_parent (iface);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1190,11 +1459,13 @@ static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleI
 	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_id;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_gallery3_real_get_pluggables;
-#line 1163 "GalleryConnector.c"
+#line 1432 "GalleryConnector.c"
 }
 
 
-static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self) {
+static void
+shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self)
+{
 	SpitPluggable** _tmp0_;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE (self);
@@ -1206,11 +1477,13 @@ static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGaller
 	self->priv->pluggables_length1 = 0;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 1179 "GalleryConnector.c"
+#line 1450 "GalleryConnector.c"
 }
 
 
-static void shotwell_publishing_gallery3_finalize (GObject * obj) {
+static void
+shotwell_publishing_gallery3_finalize (GObject * obj)
+{
 	ShotwellPublishingGallery3 * self;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3);
@@ -1218,11 +1491,13 @@ static void shotwell_publishing_gallery3_finalize (GObject * obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (shotwell_publishing_gallery3_parent_class)->finalize (obj);
-#line 1191 "GalleryConnector.c"
+#line 1464 "GalleryConnector.c"
 }
 
 
-GType shotwell_publishing_gallery3_get_type (void) {
+GType
+shotwell_publishing_gallery3_get_type (void)
+{
 	static volatile gsize shotwell_publishing_gallery3_type_id__volatile = 0;
 	if (g_once_init_enter (&shotwell_publishing_gallery3_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingGallery3Class), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_gallery3_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingGallery3), 0, (GInstanceInitFunc) shotwell_publishing_gallery3_instance_init, NULL };
@@ -1236,7 +1511,10 @@ GType shotwell_publishing_gallery3_get_type (void) {
 }
 
 
-Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory) {
+Gallery3Service*
+gallery3_service_construct (GType object_type,
+                            GFile* resource_directory)
+{
 	Gallery3Service * self = NULL;
 	GdkPixbuf** _tmp0_;
 	gint _tmp0__length1;
@@ -1250,7 +1528,7 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_
 	_tmp0__length1 = gallery3_service_icon_pixbuf_set_length1;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp0_ == NULL) {
-#line 1223 "GalleryConnector.c"
+#line 1501 "GalleryConnector.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1263,44 +1541,43 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_
 		gallery3_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_gallery3_service_icon_pixbuf_set_size_ = gallery3_service_icon_pixbuf_set_length1;
-#line 1236 "GalleryConnector.c"
+#line 1514 "GalleryConnector.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 1240 "GalleryConnector.c"
+#line 1518 "GalleryConnector.c"
 }
 
 
-Gallery3Service* gallery3_service_new (GFile* resource_directory) {
+Gallery3Service*
+gallery3_service_new (GFile* resource_directory)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return gallery3_service_construct (TYPE_GALLERY3_SERVICE, resource_directory);
-#line 1247 "GalleryConnector.c"
+#line 1527 "GalleryConnector.c"
 }
 
 
-static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+gallery3_service_real_get_pluggable_interface (SpitPluggable* base,
+                                               gint min_host_interface,
+                                               gint max_host_interface)
+{
 	Gallery3Service * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = min_host_interface;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = max_host_interface;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1269 "GalleryConnector.c"
+#line 1544 "GalleryConnector.c"
 }
 
 
-static const gchar* gallery3_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+gallery3_service_real_get_id (SpitPluggable* base)
+{
 	Gallery3Service * self;
 	const gchar* result = NULL;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1309,11 +1586,13 @@ static const gchar* gallery3_service_real_get_id (SpitPluggable* base) {
 	result = "publishing-gallery3";
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1282 "GalleryConnector.c"
+#line 1559 "GalleryConnector.c"
 }
 
 
-static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+gallery3_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	Gallery3Service * self;
 	const gchar* result = NULL;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1322,39 +1601,47 @@ static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "Gallery3";
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1295 "GalleryConnector.c"
+#line 1574 "GalleryConnector.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1302 "GalleryConnector.c"
+#line 1583 "GalleryConnector.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup1 (GdkPixbuf** self,
+                  int length)
+{
 	GdkPixbuf** result;
 	int i;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	for (i = 0; i < length; i++) {
-#line 1313 "GalleryConnector.c"
+#line 1597 "GalleryConnector.c"
 		GdkPixbuf* _tmp0_;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		result[i] = _tmp0_;
-#line 1319 "GalleryConnector.c"
+#line 1603 "GalleryConnector.c"
 	}
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1323 "GalleryConnector.c"
+#line 1607 "GalleryConnector.c"
 }
 
 
-static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+gallery3_service_real_get_info (SpitPluggable* base,
+                                SpitPluggableInfo* info)
+{
 	Gallery3Service * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -1422,40 +1709,45 @@ static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp7_;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*info).icons_length1 = _tmp7__length1;
-#line 1395 "GalleryConnector.c"
+#line 1682 "GalleryConnector.c"
 }
 
 
-static void gallery3_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+gallery3_service_real_activation (SpitPluggable* base,
+                                  gboolean enabled)
+{
 	Gallery3Service * self;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service);
-#line 1403 "GalleryConnector.c"
+#line 1693 "GalleryConnector.c"
 }
 
 
-static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+gallery3_service_real_create_publisher (SpitPublishingService* base,
+                                        SpitPublishingPluginHost* host)
+{
 	Gallery3Service * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingGallery3GalleryPublisher* _tmp1_;
+	PublishingGallery3GalleryPublisher* _tmp0_;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service);
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = host;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_gallery3_gallery_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
+	_tmp0_ = publishing_gallery3_gallery_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1424 "GalleryConnector.c"
+#line 1714 "GalleryConnector.c"
 }
 
 
-static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+gallery3_service_real_get_supported_media (SpitPublishingService* base)
+{
 	Gallery3Service * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1464,20 +1756,24 @@ static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1437 "GalleryConnector.c"
+#line 1729 "GalleryConnector.c"
 }
 
 
-static void gallery3_service_class_init (Gallery3ServiceClass * klass) {
+static void
+gallery3_service_class_init (Gallery3ServiceClass * klass)
+{
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	gallery3_service_parent_class = g_type_class_peek_parent (klass);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (klass)->finalize = gallery3_service_finalize;
-#line 1446 "GalleryConnector.c"
+#line 1740 "GalleryConnector.c"
 }
 
 
-static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	gallery3_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1490,36 +1786,44 @@ static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface *
 	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) gallery3_service_real_get_info;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	iface->activation = (void (*) (SpitPluggable *, gboolean)) gallery3_service_real_activation;
-#line 1463 "GalleryConnector.c"
+#line 1759 "GalleryConnector.c"
 }
 
 
-static void gallery3_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+gallery3_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	gallery3_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) gallery3_service_real_create_publisher;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) gallery3_service_real_get_supported_media;
-#line 1474 "GalleryConnector.c"
+#line 1772 "GalleryConnector.c"
 }
 
 
-static void gallery3_service_instance_init (Gallery3Service * self) {
+static void
+gallery3_service_instance_init (Gallery3Service * self)
+{
 }
 
 
-static void gallery3_service_finalize (GObject * obj) {
+static void
+gallery3_service_finalize (GObject * obj)
+{
 	Gallery3Service * self;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GALLERY3_SERVICE, Gallery3Service);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (gallery3_service_parent_class)->finalize (obj);
-#line 1488 "GalleryConnector.c"
+#line 1790 "GalleryConnector.c"
 }
 
 
-GType gallery3_service_get_type (void) {
+GType
+gallery3_service_get_type (void)
+{
 	static volatile gsize gallery3_service_type_id__volatile = 0;
 	if (g_once_init_enter (&gallery3_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (Gallery3ServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gallery3_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Gallery3Service), 0, (GInstanceInitFunc) gallery3_service_instance_init, NULL };
@@ -1535,76 +1839,74 @@ GType gallery3_service_get_type (void) {
 }
 
 
-PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection) {
+PublishingGallery3Album*
+publishing_gallery3_album_construct (GType object_type,
+                                     JsonObject* collection)
+{
 	PublishingGallery3Album* self = NULL;
 	JsonObject* entity = NULL;
 	JsonObject* _tmp0_;
-	JsonObject* _tmp1_;
+	const gchar* _tmp1_;
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
 	const gchar* _tmp4_;
-	JsonObject* _tmp5_;
-	const gchar* _tmp6_;
-	gboolean _tmp7_;
-	const gchar* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (collection != NULL, NULL);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3Album*) g_type_create_instance (object_type);
 #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = collection;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = json_object_get_object_member (_tmp0_, "entity");
+	_tmp0_ = json_object_get_object_member (collection, "entity");
 #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	entity = _tmp1_;
+	entity = _tmp0_;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = json_object_get_string_member (entity, "title");
+	_tmp1_ = json_object_get_string_member (entity, "title");
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_album_set_title (self, _tmp2_);
+	publishing_gallery3_album_set_title (self, _tmp1_);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = json_object_get_string_member (entity, "name");
+	_tmp2_ = json_object_get_string_member (entity, "name");
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_album_set_name (self, _tmp3_);
+	publishing_gallery3_album_set_name (self, _tmp2_);
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = json_object_get_string_member (entity, "parent");
+	_tmp3_ = json_object_get_string_member (entity, "parent");
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_album_set_parentname (self, _tmp4_);
+	publishing_gallery3_album_set_parentname (self, _tmp3_);
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = collection;
+	_tmp4_ = json_object_get_string_member (collection, "url");
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = json_object_get_string_member (_tmp5_, "url");
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_album_set_url (self, _tmp6_);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = json_object_get_boolean_member (entity, "can_edit");
+	publishing_gallery3_album_set_url (self, _tmp4_);
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_album_set_editable (self, _tmp7_);
+	publishing_gallery3_album_set_editable (self, json_object_get_boolean_member (entity, "can_edit"));
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = self->priv->_url;
+	_tmp5_ = self->priv->_url;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = publishing_gallery3_strip_session_url (_tmp8_);
+	_tmp6_ = publishing_gallery3_strip_session_url (_tmp5_);
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = _tmp9_;
+	_tmp7_ = _tmp6_;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_album_set_path (self, _tmp10_);
+	publishing_gallery3_album_set_path (self, _tmp7_);
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp10_);
+	_g_free0 (_tmp7_);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 1566 "GalleryConnector.c"
+#line 1864 "GalleryConnector.c"
 }
 
 
-PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection) {
+PublishingGallery3Album*
+publishing_gallery3_album_new (JsonObject* collection)
+{
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_album_construct (PUBLISHING_GALLERY3_TYPE_ALBUM, collection);
-#line 1573 "GalleryConnector.c"
+#line 1873 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_name (PublishingGallery3Album* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1615,28 +1917,30 @@ const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self)
 	result = _tmp0_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1588 "GalleryConnector.c"
+#line 1890 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_name (PublishingGallery3Album* self,
+                                    const gchar* value)
+{
+	gchar* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_name);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_name = _tmp1_;
-#line 1605 "GalleryConnector.c"
+	self->priv->_name = _tmp0_;
+#line 1907 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_title (PublishingGallery3Album* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1647,28 +1951,30 @@ const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self)
 	result = _tmp0_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1620 "GalleryConnector.c"
+#line 1924 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_title (PublishingGallery3Album* self,
+                                     const gchar* value)
+{
+	gchar* _tmp0_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_title);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_title = _tmp1_;
-#line 1637 "GalleryConnector.c"
+	self->priv->_title = _tmp0_;
+#line 1941 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_summary (PublishingGallery3Album* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1679,28 +1985,30 @@ const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* sel
 	result = _tmp0_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1652 "GalleryConnector.c"
+#line 1958 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_summary (PublishingGallery3Album* self,
+                                       const gchar* value)
+{
+	gchar* _tmp0_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_summary);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_summary = _tmp1_;
-#line 1669 "GalleryConnector.c"
+	self->priv->_summary = _tmp0_;
+#line 1975 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_parentname (PublishingGallery3Album* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1711,28 +2019,30 @@ const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album*
 	result = _tmp0_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1684 "GalleryConnector.c"
+#line 1992 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_parentname (PublishingGallery3Album* self,
+                                          const gchar* value)
+{
+	gchar* _tmp0_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_parentname);
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_parentname = _tmp1_;
-#line 1701 "GalleryConnector.c"
+	self->priv->_parentname = _tmp0_;
+#line 2009 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_url (PublishingGallery3Album* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1743,28 +2053,30 @@ const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) {
 	result = _tmp0_;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1716 "GalleryConnector.c"
+#line 2026 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_url (PublishingGallery3Album* self,
+                                   const gchar* value)
+{
+	gchar* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_url);
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_url = _tmp1_;
-#line 1733 "GalleryConnector.c"
+	self->priv->_url = _tmp0_;
+#line 2043 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_path (PublishingGallery3Album* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1775,28 +2087,30 @@ const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self)
 	result = _tmp0_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1748 "GalleryConnector.c"
+#line 2060 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_path (PublishingGallery3Album* self,
+                                    const gchar* value)
+{
+	gchar* _tmp0_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_path);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_path = _tmp1_;
-#line 1765 "GalleryConnector.c"
+	self->priv->_path = _tmp0_;
+#line 2077 "GalleryConnector.c"
 }
 
 
-gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) {
+gboolean
+publishing_gallery3_album_get_editable (PublishingGallery3Album* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1807,120 +2121,145 @@ gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self)
 	result = _tmp0_;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1780 "GalleryConnector.c"
+#line 2094 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value) {
-	gboolean _tmp0_;
+static void
+publishing_gallery3_album_set_editable (PublishingGallery3Album* self,
+                                        gboolean value)
+{
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_editable = _tmp0_;
-#line 1792 "GalleryConnector.c"
+	self->priv->_editable = value;
+#line 2106 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_value_album_init (GValue* value) {
+static void
+publishing_gallery3_value_album_init (GValue* value)
+{
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	value->data[0].v_pointer = NULL;
-#line 1799 "GalleryConnector.c"
+#line 2115 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_value_album_free_value (GValue* value) {
+static void
+publishing_gallery3_value_album_free_value (GValue* value)
+{
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (value->data[0].v_pointer) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_album_unref (value->data[0].v_pointer);
-#line 1808 "GalleryConnector.c"
+#line 2126 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_gallery3_value_album_copy_value (const GValue* src_value,
+                                            GValue* dest_value)
+{
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (src_value->data[0].v_pointer) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		dest_value->data[0].v_pointer = publishing_gallery3_album_ref (src_value->data[0].v_pointer);
-#line 1818 "GalleryConnector.c"
+#line 2139 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1822 "GalleryConnector.c"
+#line 2143 "GalleryConnector.c"
 	}
 }
 
 
-static gpointer publishing_gallery3_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_gallery3_value_album_peek_pointer (const GValue* value)
+{
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return value->data[0].v_pointer;
-#line 1830 "GalleryConnector.c"
+#line 2153 "GalleryConnector.c"
 }
 
 
-static gchar* publishing_gallery3_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_album_collect_value (GValue* value,
+                                               guint n_collect_values,
+                                               GTypeCValue* collect_values,
+                                               guint collect_flags)
+{
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (collect_values[0].v_pointer) {
-#line 1837 "GalleryConnector.c"
+#line 2165 "GalleryConnector.c"
 		PublishingGallery3Album * object;
 		object = collect_values[0].v_pointer;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1844 "GalleryConnector.c"
+#line 2172 "GalleryConnector.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1848 "GalleryConnector.c"
+#line 2176 "GalleryConnector.c"
 		}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = publishing_gallery3_album_ref (object);
-#line 1852 "GalleryConnector.c"
+#line 2180 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 1856 "GalleryConnector.c"
+#line 2184 "GalleryConnector.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 1860 "GalleryConnector.c"
+#line 2188 "GalleryConnector.c"
 }
 
 
-static gchar* publishing_gallery3_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_album_lcopy_value (const GValue* value,
+                                             guint n_collect_values,
+                                             GTypeCValue* collect_values,
+                                             guint collect_flags)
+{
 	PublishingGallery3Album ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (!object_p) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1871 "GalleryConnector.c"
+#line 2204 "GalleryConnector.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (!value->data[0].v_pointer) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*object_p = NULL;
-#line 1877 "GalleryConnector.c"
+#line 2210 "GalleryConnector.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1881 "GalleryConnector.c"
+#line 2214 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*object_p = publishing_gallery3_album_ref (value->data[0].v_pointer);
-#line 1885 "GalleryConnector.c"
+#line 2218 "GalleryConnector.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 1889 "GalleryConnector.c"
+#line 2222 "GalleryConnector.c"
 }
 
 
-GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_gallery3_param_spec_album (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags)
+{
 	PublishingGallery3ParamSpecAlbum* spec;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_GALLERY3_TYPE_ALBUM), NULL);
@@ -1930,20 +2269,25 @@ GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return G_PARAM_SPEC (spec);
-#line 1903 "GalleryConnector.c"
+#line 2242 "GalleryConnector.c"
 }
 
 
-gpointer publishing_gallery3_value_get_album (const GValue* value) {
+gpointer
+publishing_gallery3_value_get_album (const GValue* value)
+{
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM), NULL);
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return value->data[0].v_pointer;
-#line 1912 "GalleryConnector.c"
+#line 2253 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_set_album (GValue* value,
+                                     gpointer v_object)
+{
 	PublishingGallery3Album * old;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM));
@@ -1959,22 +2303,25 @@ void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_album_ref (value->data[0].v_pointer);
-#line 1932 "GalleryConnector.c"
+#line 2276 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 1936 "GalleryConnector.c"
+#line 2280 "GalleryConnector.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (old) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_album_unref (old);
-#line 1942 "GalleryConnector.c"
+#line 2286 "GalleryConnector.c"
 	}
 }
 
 
-void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_take_album (GValue* value,
+                                      gpointer v_object)
+{
 	PublishingGallery3Album * old;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM));
@@ -1988,33 +2335,37 @@ void publishing_gallery3_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 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = v_object;
-#line 1961 "GalleryConnector.c"
+#line 2308 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 1965 "GalleryConnector.c"
+#line 2312 "GalleryConnector.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (old) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_album_unref (old);
-#line 1971 "GalleryConnector.c"
+#line 2318 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * klass) {
+static void
+publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * klass)
+{
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_album_parent_class = g_type_class_peek_parent (klass);
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingGallery3AlbumClass *) klass)->finalize = publishing_gallery3_album_finalize;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (PublishingGallery3AlbumPrivate));
-#line 1983 "GalleryConnector.c"
+#line 2332 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_instance_init (PublishingGallery3Album * self) {
+static void
+publishing_gallery3_album_instance_init (PublishingGallery3Album * self)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
@@ -2051,11 +2402,13 @@ static void publishing_gallery3_album_instance_init (PublishingGallery3Album * s
 	self->priv->_editable = FALSE;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->ref_count = 1;
-#line 2024 "GalleryConnector.c"
+#line 2375 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj) {
+static void
+publishing_gallery3_album_finalize (PublishingGallery3Album * obj)
+{
 	PublishingGallery3Album * self;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_ALBUM, PublishingGallery3Album);
@@ -2073,11 +2426,13 @@ static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj) {
 	_g_free0 (self->priv->_url);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_path);
-#line 2046 "GalleryConnector.c"
+#line 2399 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_album_get_type (void) {
+GType
+publishing_gallery3_album_get_type (void)
+{
 	static volatile gsize publishing_gallery3_album_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_album_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_gallery3_value_album_init, publishing_gallery3_value_album_free_value, publishing_gallery3_value_album_copy_value, publishing_gallery3_value_album_peek_pointer, "p", publishing_gallery3_value_album_collect_value, "p", publishing_gallery3_value_album_lcopy_value };
@@ -2091,18 +2446,22 @@ GType publishing_gallery3_album_get_type (void) {
 }
 
 
-gpointer publishing_gallery3_album_ref (gpointer instance) {
+gpointer
+publishing_gallery3_album_ref (gpointer instance)
+{
 	PublishingGallery3Album * self;
 	self = instance;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return instance;
-#line 2071 "GalleryConnector.c"
+#line 2428 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_album_unref (gpointer instance) {
+void
+publishing_gallery3_album_unref (gpointer instance)
+{
 	PublishingGallery3Album * self;
 	self = instance;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2111,42 +2470,43 @@ void publishing_gallery3_album_unref (gpointer instance) {
 		PUBLISHING_GALLERY3_ALBUM_GET_CLASS (self)->finalize (self);
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2084 "GalleryConnector.c"
+#line 2443 "GalleryConnector.c"
 	}
 }
 
 
-static gchar string_get (const gchar* self, glong index) {
+static gchar
+string_get (const gchar* self,
+            glong index)
+{
 	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar _tmp0_;
+#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = ((gchar*) self)[index];
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_;
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 2103 "GalleryConnector.c"
+#line 2462 "GalleryConnector.c"
 }
 
 
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3BaseGalleryTransaction*
+publishing_gallery3_base_gallery_transaction_construct (GType object_type,
+                                                        PublishingGallery3Session* session,
+                                                        const gchar* endpoint_url,
+                                                        const gchar* item_path,
+                                                        PublishingRESTSupportHttpMethod method)
+{
 	PublishingGallery3BaseGalleryTransaction* self = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_;
-	PublishingGallery3Session* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	const gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-	PublishingRESTSupportHttpMethod _tmp12_;
-	JsonParser* _tmp13_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	JsonParser* _tmp5_;
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2154,78 +2514,65 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (item_path != NULL, NULL);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = item_path;
+	if (g_strcmp0 (item_path, "") != 0) {
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (g_strcmp0 (_tmp1_, "") != 0) {
-#line 2130 "GalleryConnector.c"
-		const gchar* _tmp2_;
-		gchar _tmp3_;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp2_ = item_path;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = string_get (_tmp2_, (glong) 0);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp0_ = _tmp3_ != '/';
-#line 2139 "GalleryConnector.c"
+		_tmp0_ = string_get (item_path, (glong) 0) != '/';
+#line 2490 "GalleryConnector.c"
 	} else {
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = FALSE;
-#line 2143 "GalleryConnector.c"
+#line 2494 "GalleryConnector.c"
 	}
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp0_) {
-#line 2147 "GalleryConnector.c"
-		const gchar* _tmp4_;
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_warning ("GalleryConnector.vala:164: Bad item path, this is a bug!");
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = item_path;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		g_error ("GalleryConnector.vala:165: %s", _tmp4_);
-#line 2155 "GalleryConnector.c"
+		g_error ("GalleryConnector.vala:165: %s", item_path);
+#line 2502 "GalleryConnector.c"
 	}
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = session;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = endpoint_url;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = g_strconcat (_tmp6_, PUBLISHING_GALLERY3_REST_PATH, NULL);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = _tmp7_;
+	_tmp1_ = g_strconcat (endpoint_url, PUBLISHING_GALLERY3_REST_PATH, NULL);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = item_path;
+	_tmp2_ = _tmp1_;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = g_strconcat (_tmp8_, _tmp9_, NULL);
+	_tmp3_ = g_strconcat (_tmp2_, item_path, NULL);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = _tmp10_;
+	_tmp4_ = _tmp3_;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = method;
+	self = (PublishingGallery3BaseGalleryTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp4_, method);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self = (PublishingGallery3BaseGalleryTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp11_, _tmp12_);
+	_g_free0 (_tmp4_);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp11_);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp2_);
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = json_parser_new ();
+	_tmp5_ = json_parser_new ();
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->parser);
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->parser = _tmp13_;
+	self->parser = _tmp5_;
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 2187 "GalleryConnector.c"
+#line 2526 "GalleryConnector.c"
 }
 
 
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3BaseGalleryTransaction*
+publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session,
+                                                  const gchar* endpoint_url,
+                                                  const gchar* item_path,
+                                                  PublishingRESTSupportHttpMethod method)
+{
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_base_gallery_transaction_construct (PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, session, endpoint_url, item_path, method);
-#line 2194 "GalleryConnector.c"
+#line 2538 "GalleryConnector.c"
 }
 
 
-JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, GError** error) {
+JsonNode*
+publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self,
+                                                            GError** error)
+{
 	JsonNode* result = NULL;
 	gchar* json_object = NULL;
 	JsonNode* root_node = NULL;
@@ -2234,7 +2581,6 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 	const gchar* _tmp2_;
 	JsonParser* _tmp15_;
 	JsonNode* _tmp16_;
-	gboolean _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_BASE_GALLERY_TRANSACTION (self), NULL);
@@ -2250,7 +2596,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 	if (NULL == _tmp2_) {
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = TRUE;
-#line 2223 "GalleryConnector.c"
+#line 2569 "GalleryConnector.c"
 	} else {
 		const gchar* _tmp3_;
 		gint _tmp4_;
@@ -2263,11 +2609,11 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 		_tmp5_ = _tmp4_;
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = 0 == _tmp5_;
-#line 2236 "GalleryConnector.c"
+#line 2582 "GalleryConnector.c"
 	}
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp1_) {
-#line 2240 "GalleryConnector.c"
+#line 2586 "GalleryConnector.c"
 		gchar* _tmp6_;
 		gchar* _tmp7_;
 		GError* _tmp8_;
@@ -2292,7 +2638,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 			_g_free0 (json_object);
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 2265 "GalleryConnector.c"
+#line 2611 "GalleryConnector.c"
 		} else {
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_free0 (json_object);
@@ -2302,7 +2648,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 			g_clear_error (&_inner_error_);
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 2275 "GalleryConnector.c"
+#line 2621 "GalleryConnector.c"
 		}
 	}
 	{
@@ -2316,7 +2662,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 		json_parser_load_from_data (_tmp10_, _tmp11_, (gssize) -1, &_inner_error_);
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2289 "GalleryConnector.c"
+#line 2635 "GalleryConnector.c"
 			goto __catch0_g_error;
 		}
 	}
@@ -2345,7 +2691,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 		_inner_error_ = _tmp14_;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (e);
-#line 2318 "GalleryConnector.c"
+#line 2664 "GalleryConnector.c"
 		goto __finally0;
 	}
 	__finally0:
@@ -2359,7 +2705,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 			_g_free0 (json_object);
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 2332 "GalleryConnector.c"
+#line 2678 "GalleryConnector.c"
 		} else {
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_free0 (json_object);
@@ -2369,7 +2715,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 			g_clear_error (&_inner_error_);
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 2342 "GalleryConnector.c"
+#line 2688 "GalleryConnector.c"
 		}
 	}
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2379,15 +2725,13 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	root_node = _tmp16_;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = json_node_is_null (root_node);
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp17_) {
-#line 2355 "GalleryConnector.c"
-		GError* _tmp18_;
+	if (json_node_is_null (root_node)) {
+#line 2699 "GalleryConnector.c"
+		GError* _tmp17_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Root node is null, doesn't appear to be JSON data");
+		_tmp17_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Root node is null, doesn't appear to be JSON data");
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_inner_error_ = _tmp18_;
+		_inner_error_ = _tmp17_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2396,7 +2740,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 			_g_free0 (json_object);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 2369 "GalleryConnector.c"
+#line 2713 "GalleryConnector.c"
 		} else {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_free0 (json_object);
@@ -2406,7 +2750,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 			g_clear_error (&_inner_error_);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 2379 "GalleryConnector.c"
+#line 2723 "GalleryConnector.c"
 		}
 	}
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2415,24 +2759,30 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 	_g_free0 (json_object);
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 2388 "GalleryConnector.c"
+#line 2732 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_base_gallery_transaction_class_init (PublishingGallery3BaseGalleryTransactionClass * klass) {
+static void
+publishing_gallery3_base_gallery_transaction_class_init (PublishingGallery3BaseGalleryTransactionClass * klass)
+{
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_base_gallery_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_base_gallery_transaction_finalize;
-#line 2397 "GalleryConnector.c"
+#line 2743 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_base_gallery_transaction_instance_init (PublishingGallery3BaseGalleryTransaction * self) {
+static void
+publishing_gallery3_base_gallery_transaction_instance_init (PublishingGallery3BaseGalleryTransaction * self)
+{
 }
 
 
-static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingGallery3BaseGalleryTransaction * self;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction);
@@ -2440,11 +2790,13 @@ static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRES
 	_g_object_unref0 (self->parser);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_base_gallery_transaction_parent_class)->finalize (obj);
-#line 2413 "GalleryConnector.c"
+#line 2763 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_base_gallery_transaction_get_type (void) {
+GType
+publishing_gallery3_base_gallery_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_base_gallery_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_base_gallery_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3BaseGalleryTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_base_gallery_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3BaseGalleryTransaction), 0, (GInstanceInitFunc) publishing_gallery3_base_gallery_transaction_instance_init, NULL };
@@ -2456,12 +2808,14 @@ GType publishing_gallery3_base_gallery_transaction_get_type (void) {
 }
 
 
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingGallery3KeyFetchTransaction*
+publishing_gallery3_key_fetch_transaction_construct (GType object_type,
+                                                     PublishingGallery3Session* session,
+                                                     const gchar* url,
+                                                     const gchar* username,
+                                                     const gchar* password)
+{
 	PublishingGallery3KeyFetchTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2471,152 +2825,116 @@ PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (password != NULL, NULL);
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = url;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self = (PublishingGallery3KeyFetchTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp0_, _tmp1_, "", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingGallery3KeyFetchTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, url, "", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = username;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "user", _tmp2_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = password;
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "user", username);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", password);
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 2459 "GalleryConnector.c"
+#line 2805 "GalleryConnector.c"
 }
 
 
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingGallery3KeyFetchTransaction*
+publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session,
+                                               const gchar* url,
+                                               const gchar* username,
+                                               const gchar* password)
+{
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_key_fetch_transaction_construct (PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, session, url, username, password);
-#line 2466 "GalleryConnector.c"
+#line 2817 "GalleryConnector.c"
 }
 
 
-static gchar* string_slice (const gchar* self, glong start, glong end) {
+static gchar*
+string_slice (const gchar* self,
+              glong start,
+              glong end)
+{
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gint _tmp0_;
 	gint _tmp1_;
-	glong _tmp2_;
-	glong _tmp5_;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_;
-	glong _tmp16_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	gchar* _tmp21_;
-#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+	gchar* _tmp8_;
+#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 2499 "GalleryConnector.c"
+#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (start < ((glong) 0)) {
+#line 2843 "GalleryConnector.c"
+		glong _tmp2_;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = string_length;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		start = _tmp2_ + start;
+#line 2849 "GalleryConnector.c"
+	}
+#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (end < ((glong) 0)) {
+#line 2853 "GalleryConnector.c"
 		glong _tmp3_;
-		glong _tmp4_;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#line 2508 "GalleryConnector.c"
-	}
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp5_ = end;
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp5_ < ((glong) 0)) {
-#line 2514 "GalleryConnector.c"
-		glong _tmp6_;
-		glong _tmp7_;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#line 2523 "GalleryConnector.c"
-	}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp9_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp9_ >= ((glong) 0)) {
-#line 2529 "GalleryConnector.c"
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2538 "GalleryConnector.c"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		end = _tmp3_ + end;
+#line 2859 "GalleryConnector.c"
+	}
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (start >= ((glong) 0)) {
+#line 2863 "GalleryConnector.c"
+		glong _tmp5_;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = string_length;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = start <= _tmp5_;
+#line 2869 "GalleryConnector.c"
 	} else {
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 2542 "GalleryConnector.c"
-	}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 2550 "GalleryConnector.c"
-		glong _tmp14_;
-		glong _tmp15_;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2559 "GalleryConnector.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = FALSE;
+#line 2873 "GalleryConnector.c"
+	}
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp4_, NULL);
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (end >= ((glong) 0)) {
+#line 2879 "GalleryConnector.c"
+		glong _tmp7_;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = string_length;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = end <= _tmp7_;
+#line 2885 "GalleryConnector.c"
 	} else {
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
-#line 2563 "GalleryConnector.c"
-	}
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = FALSE;
+#line 2889 "GalleryConnector.c"
+	}
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp6_, NULL);
+#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (start <= end, NULL);
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start));
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp8_;
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 2585 "GalleryConnector.c"
+#line 2901 "GalleryConnector.c"
 }
 
 
-gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self) {
+gchar*
+publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp3_;
@@ -2633,7 +2951,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
 	_tmp0_ = self->priv->key;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (g_strcmp0 (_tmp0_, "") != 0) {
-#line 2606 "GalleryConnector.c"
+#line 2924 "GalleryConnector.c"
 		const gchar* _tmp1_;
 		gchar* _tmp2_;
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2644,7 +2962,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
 		result = _tmp2_;
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return result;
-#line 2617 "GalleryConnector.c"
+#line 2935 "GalleryConnector.c"
 	}
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp3_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
@@ -2658,20 +2976,20 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
 	if (NULL == _tmp6_) {
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = TRUE;
-#line 2631 "GalleryConnector.c"
+#line 2949 "GalleryConnector.c"
 	} else {
 		const gchar* _tmp7_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp7_ = self->priv->key;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = g_strcmp0 ("", _tmp7_) == 0;
-#line 2638 "GalleryConnector.c"
+#line 2956 "GalleryConnector.c"
 	}
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp5_) {
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = TRUE;
-#line 2644 "GalleryConnector.c"
+#line 2962 "GalleryConnector.c"
 	} else {
 		const gchar* _tmp8_;
 		gint _tmp9_;
@@ -2684,11 +3002,11 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
 		_tmp10_ = _tmp9_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = 0 == _tmp10_;
-#line 2657 "GalleryConnector.c"
+#line 2975 "GalleryConnector.c"
 	}
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp4_) {
-#line 2661 "GalleryConnector.c"
+#line 2979 "GalleryConnector.c"
 		gchar* _tmp11_;
 		gchar* _tmp12_;
 		gchar* _tmp13_;
@@ -2706,7 +3024,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
 		result = _tmp13_;
 #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return result;
-#line 2679 "GalleryConnector.c"
+#line 2997 "GalleryConnector.c"
 	}
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp14_ = self->priv->key;
@@ -2724,22 +3042,26 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
 	result = _tmp17_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 2697 "GalleryConnector.c"
+#line 3015 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_key_fetch_transaction_class_init (PublishingGallery3KeyFetchTransactionClass * klass) {
+static void
+publishing_gallery3_key_fetch_transaction_class_init (PublishingGallery3KeyFetchTransactionClass * klass)
+{
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_key_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_key_fetch_transaction_finalize;
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (PublishingGallery3KeyFetchTransactionPrivate));
-#line 2708 "GalleryConnector.c"
+#line 3028 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self) {
+static void
+publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self)
+{
 	gchar* _tmp0_;
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE (self);
@@ -2747,11 +3069,13 @@ static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingG
 	_tmp0_ = g_strdup ("");
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->key = _tmp0_;
-#line 2720 "GalleryConnector.c"
+#line 3042 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingGallery3KeyFetchTransaction * self;
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransaction);
@@ -2759,11 +3083,13 @@ static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSu
 	_g_free0 (self->priv->key);
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_key_fetch_transaction_parent_class)->finalize (obj);
-#line 2732 "GalleryConnector.c"
+#line 3056 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_key_fetch_transaction_get_type (void) {
+GType
+publishing_gallery3_key_fetch_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_key_fetch_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_key_fetch_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3KeyFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_key_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3KeyFetchTransaction), 0, (GInstanceInitFunc) publishing_gallery3_key_fetch_transaction_instance_init, NULL };
@@ -2775,84 +3101,78 @@ GType publishing_gallery3_key_fetch_transaction_get_type (void) {
 }
 
 
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3GalleryRequestTransaction*
+publishing_gallery3_gallery_request_transaction_construct (GType object_type,
+                                                           PublishingGallery3Session* session,
+                                                           const gchar* item,
+                                                           PublishingRESTSupportHttpMethod method)
+{
 	PublishingGallery3GalleryRequestTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	gboolean _tmp1_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (item != NULL, NULL);
 #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp1_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:254: Not authenticated");
-#line 2764 "GalleryConnector.c"
+#line 3089 "GalleryConnector.c"
 	} else {
-		PublishingGallery3Session* _tmp2_;
-		PublishingGallery3Session* _tmp3_;
-		const gchar* _tmp4_;
-		const gchar* _tmp5_;
-		const gchar* _tmp6_;
-		PublishingRESTSupportHttpMethod _tmp7_;
-		PublishingGallery3Session* _tmp8_;
-		const gchar* _tmp9_;
-		const gchar* _tmp10_;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp2_ = session;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = session;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = publishing_gallery3_session_get_url (_tmp3_);
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = _tmp4_;
+		const gchar* _tmp0_;
+		const gchar* _tmp1_;
+		const gchar* _tmp2_;
+		const gchar* _tmp3_;
 #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = item;
+		_tmp0_ = publishing_gallery3_session_get_url (session);
 #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = method;
+		_tmp1_ = _tmp0_;
 #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		self = (PublishingGallery3GalleryRequestTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp2_, _tmp5_, _tmp6_, _tmp7_);
+		self = (PublishingGallery3GalleryRequestTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp1_, item, method);
 #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = session;
+		_tmp2_ = publishing_gallery3_session_get_key (session);
 #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = publishing_gallery3_session_get_key (_tmp8_);
+		_tmp3_ = _tmp2_;
 #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = _tmp9_;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp10_);
+		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp3_);
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "GET");
-#line 2799 "GalleryConnector.c"
+#line 3109 "GalleryConnector.c"
 	}
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 2803 "GalleryConnector.c"
+#line 3113 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3GalleryRequestTransaction*
+publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session,
+                                                     const gchar* item,
+                                                     PublishingRESTSupportHttpMethod method)
+{
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_gallery_request_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_REQUEST_TRANSACTION, session, item, method);
-#line 2810 "GalleryConnector.c"
+#line 3124 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_request_transaction_class_init (PublishingGallery3GalleryRequestTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_request_transaction_class_init (PublishingGallery3GalleryRequestTransactionClass * klass)
+{
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2817 "GalleryConnector.c"
+#line 3133 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_request_transaction_instance_init (PublishingGallery3GalleryRequestTransaction * self) {
+static void
+publishing_gallery3_gallery_request_transaction_instance_init (PublishingGallery3GalleryRequestTransaction * self)
+{
 }
 
 
-GType publishing_gallery3_gallery_request_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_request_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_gallery_request_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_gallery_request_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryRequestTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_request_transaction_instance_init, NULL };
@@ -2864,50 +3184,60 @@ GType publishing_gallery3_gallery_request_transaction_get_type (void) {
 }
 
 
-PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session) {
+PublishingGallery3GetAlbumURLsTransaction*
+publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type,
+                                                           PublishingGallery3Session* session)
+{
 	PublishingGallery3GetAlbumURLsTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self = (PublishingGallery3GetAlbumURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	self = (PublishingGallery3GetAlbumURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "album");
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "scope", "all");
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 2852 "GalleryConnector.c"
+#line 3172 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session) {
+PublishingGallery3GetAlbumURLsTransaction*
+publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session)
+{
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_get_album_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION, session);
-#line 2859 "GalleryConnector.c"
+#line 3181 "GalleryConnector.c"
 }
 
 
-static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add2 (gchar** * array,
+                  int* length,
+                  int* size,
+                  gchar* value)
+{
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if ((*length) == (*size)) {
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2870 "GalleryConnector.c"
+#line 3197 "GalleryConnector.c"
 	}
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[(*length)++] = value;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[*length] = NULL;
-#line 2876 "GalleryConnector.c"
+#line 3203 "GalleryConnector.c"
 }
 
 
-gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, int* result_length1) {
+gchar**
+publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self,
+                                                                int* result_length1)
+{
 	gchar** result = NULL;
 	JsonNode* root_node = NULL;
 	JsonArray* all_members = NULL;
@@ -2916,12 +3246,12 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 	gchar** member_urls = NULL;
 	gint member_urls_length1;
 	gint _member_urls_size_;
-	gchar** _tmp14_;
-	gint _tmp14__length1;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
 	GError * _inner_error_ = NULL;
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUM_UR_LS_TRANSACTION (self), NULL);
-#line 2894 "GalleryConnector.c"
+#line 3224 "GalleryConnector.c"
 	{
 		JsonNode* _tmp0_ = NULL;
 		JsonNode* _tmp1_;
@@ -2933,7 +3263,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2906 "GalleryConnector.c"
+#line 3236 "GalleryConnector.c"
 				goto __catch1_spit_publishing_publishing_error;
 			}
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2942,11 +3272,11 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 			g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 2915 "GalleryConnector.c"
+#line 3245 "GalleryConnector.c"
 		}
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		root_node = _tmp0_;
-#line 2919 "GalleryConnector.c"
+#line 3249 "GalleryConnector.c"
 	}
 	goto __finally1;
 	__catch1_spit_publishing_publishing_error:
@@ -2960,7 +3290,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 		g_error ("GalleryConnector.vala:285: Could not get root node");
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (e);
-#line 2933 "GalleryConnector.c"
+#line 3263 "GalleryConnector.c"
 	}
 	__finally1:
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2971,7 +3301,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 		g_clear_error (&_inner_error_);
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return NULL;
-#line 2944 "GalleryConnector.c"
+#line 3274 "GalleryConnector.c"
 	}
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp2_ = json_node_get_object (root_node);
@@ -2985,37 +3315,36 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 	member_urls_length1 = 0;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_member_urls_size_ = member_urls_length1;
-#line 2958 "GalleryConnector.c"
+#line 3288 "GalleryConnector.c"
 	{
 		guint i = 0U;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = (guint) 0;
-#line 2963 "GalleryConnector.c"
+#line 3293 "GalleryConnector.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp4_ = TRUE;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			while (TRUE) {
-#line 2970 "GalleryConnector.c"
+#line 3300 "GalleryConnector.c"
 				guint _tmp6_;
 				JsonArray* _tmp7_;
-				guint _tmp8_;
-				gchar** _tmp9_;
-				gint _tmp9__length1;
-				JsonArray* _tmp10_;
-				guint _tmp11_;
-				const gchar* _tmp12_;
-				gchar* _tmp13_;
+				gchar** _tmp8_;
+				gint _tmp8__length1;
+				JsonArray* _tmp9_;
+				guint _tmp10_;
+				const gchar* _tmp11_;
+				gchar* _tmp12_;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp4_) {
-#line 2982 "GalleryConnector.c"
+#line 3311 "GalleryConnector.c"
 					guint _tmp5_;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp5_ = i;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					i = _tmp5_ + 1;
-#line 2988 "GalleryConnector.c"
+#line 3317 "GalleryConnector.c"
 				}
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp4_ = FALSE;
@@ -3024,61 +3353,65 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp7_ = all_members;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp8_ = json_array_get_length (_tmp7_);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				if (!(_tmp6_ <= (_tmp8_ - 1))) {
+				if (!(_tmp6_ <= (json_array_get_length (_tmp7_) - 1))) {
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					break;
-#line 3002 "GalleryConnector.c"
+#line 3329 "GalleryConnector.c"
 				}
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp9_ = member_urls;
+				_tmp8_ = member_urls;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp9__length1 = member_urls_length1;
+				_tmp8__length1 = member_urls_length1;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp10_ = all_members;
+				_tmp9_ = all_members;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp11_ = i;
+				_tmp10_ = i;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp12_ = json_array_get_string_element (_tmp10_, _tmp11_);
+				_tmp11_ = json_array_get_string_element (_tmp9_, _tmp10_);
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp13_ = g_strdup (_tmp12_);
+				_tmp12_ = g_strdup (_tmp11_);
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_vala_array_add2 (&member_urls, &member_urls_length1, &_member_urls_size_, _tmp13_);
-#line 3018 "GalleryConnector.c"
+				_vala_array_add2 (&member_urls, &member_urls_length1, &_member_urls_size_, _tmp12_);
+#line 3345 "GalleryConnector.c"
 			}
 		}
 	}
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = member_urls;
+	_tmp13_ = member_urls;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14__length1 = member_urls_length1;
+	_tmp13__length1 = member_urls_length1;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (result_length1) {
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		*result_length1 = _tmp14__length1;
-#line 3030 "GalleryConnector.c"
+		*result_length1 = _tmp13__length1;
+#line 3357 "GalleryConnector.c"
 	}
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp14_;
+	result = _tmp13_;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 3036 "GalleryConnector.c"
+#line 3363 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_album_ur_ls_transaction_class_init (PublishingGallery3GetAlbumURLsTransactionClass * klass) {
+static void
+publishing_gallery3_get_album_ur_ls_transaction_class_init (PublishingGallery3GetAlbumURLsTransactionClass * klass)
+{
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_get_album_ur_ls_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3043 "GalleryConnector.c"
+#line 3372 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_album_ur_ls_transaction_instance_init (PublishingGallery3GetAlbumURLsTransaction * self) {
+static void
+publishing_gallery3_get_album_ur_ls_transaction_instance_init (PublishingGallery3GetAlbumURLsTransaction * self)
+{
 }
 
 
-GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) {
+GType
+publishing_gallery3_get_album_ur_ls_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_get_album_ur_ls_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_get_album_ur_ls_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GetAlbumURLsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_get_album_ur_ls_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GetAlbumURLsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_get_album_ur_ls_transaction_instance_init, NULL };
@@ -3090,476 +3423,388 @@ GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) {
 }
 
 
-static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add3 (gchar** * array,
+                  int* length,
+                  int* size,
+                  gchar* value)
+{
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if ((*length) == (*size)) {
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3070 "GalleryConnector.c"
+#line 3408 "GalleryConnector.c"
 	}
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[(*length)++] = value;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[*length] = NULL;
-#line 3076 "GalleryConnector.c"
+#line 3414 "GalleryConnector.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 3093 "GalleryConnector.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 3103 "GalleryConnector.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 3113 "GalleryConnector.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 3119 "GalleryConnector.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 3130 "GalleryConnector.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 3142 "GalleryConnector.c"
+#line 3429 "GalleryConnector.c"
+	}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (str_array != NULL) {
+#line 3433 "GalleryConnector.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 3439 "GalleryConnector.c"
 		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 3146 "GalleryConnector.c"
+			gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			if (str_array_length1 == -1) {
+#line 3444 "GalleryConnector.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 3450 "GalleryConnector.c"
+			} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp2_ = FALSE;
+#line 3454 "GalleryConnector.c"
+			}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp1_ = _tmp2_;
+#line 3458 "GalleryConnector.c"
 		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 3150 "GalleryConnector.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp1_;
+#line 3462 "GalleryConnector.c"
+	} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 3466 "GalleryConnector.c"
 	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 3154 "GalleryConnector.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 3470 "GalleryConnector.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 3177 "GalleryConnector.c"
+#line 3490 "GalleryConnector.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 3186 "GalleryConnector.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 3199 "GalleryConnector.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 3205 "GalleryConnector.c"
+#line 3499 "GalleryConnector.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 3508 "GalleryConnector.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 3514 "GalleryConnector.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 3215 "GalleryConnector.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 3227 "GalleryConnector.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 3520 "GalleryConnector.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 3526 "GalleryConnector.c"
 				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 3231 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp7_ = FALSE;
+#line 3530 "GalleryConnector.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 3237 "GalleryConnector.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 3536 "GalleryConnector.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 3248 "GalleryConnector.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 3263 "GalleryConnector.c"
+					gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					if (str_array_length1 == -1) {
+#line 3541 "GalleryConnector.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 3550 "GalleryConnector.c"
 					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 3267 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp9_ = FALSE;
+#line 3554 "GalleryConnector.c"
 					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 3271 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp6_ = _tmp9_;
+#line 3558 "GalleryConnector.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 3277 "GalleryConnector.c"
+#line 3564 "GalleryConnector.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 3289 "GalleryConnector.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 3310 "GalleryConnector.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 3572 "GalleryConnector.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 3587 "GalleryConnector.c"
 				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 3314 "GalleryConnector.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp12_ = 0;
+#line 3591 "GalleryConnector.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 3320 "GalleryConnector.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 3597 "GalleryConnector.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 3327 "GalleryConnector.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 3604 "GalleryConnector.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 3335 "GalleryConnector.c"
+#line 3612 "GalleryConnector.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 3373 "GalleryConnector.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 3644 "GalleryConnector.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 3382 "GalleryConnector.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 3398 "GalleryConnector.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 3404 "GalleryConnector.c"
+#line 3653 "GalleryConnector.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 3664 "GalleryConnector.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 3670 "GalleryConnector.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 3418 "GalleryConnector.c"
+#line 3680 "GalleryConnector.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 3438 "GalleryConnector.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 3453 "GalleryConnector.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 3694 "GalleryConnector.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 3703 "GalleryConnector.c"
 				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 3457 "GalleryConnector.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp38_ = "";
+#line 3707 "GalleryConnector.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 3465 "GalleryConnector.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 3715 "GalleryConnector.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 3476 "GalleryConnector.c"
+#line 3726 "GalleryConnector.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 3485 "GalleryConnector.c"
+#line 3735 "GalleryConnector.c"
 	}
 }
 
 
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) {
+PublishingGallery3GetAlbumsTransaction*
+publishing_gallery3_get_albums_transaction_construct (GType object_type,
+                                                      PublishingGallery3Session* session,
+                                                      gchar** _album_urls,
+                                                      int _album_urls_length1,
+                                                      guint start)
+{
 	PublishingGallery3GetAlbumsTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	gchar** _tmp1_;
-	gint _tmp1__length1;
 	gchar* url_list = NULL;
-	gchar* _tmp2_;
+	gchar* _tmp0_;
 	gchar** my_album_urls = NULL;
 	gint my_album_urls_length1;
 	gint _my_album_urls_size_;
 	gchar* endpoint_url = NULL;
-	PublishingGallery3Session* _tmp3_;
-	gchar* _tmp4_;
-	gint _tmp5_ = 0;
-	const gchar* _tmp6_;
+	gchar* _tmp1_;
+	gint _tmp2_ = 0;
+	const gchar* _tmp3_;
 	gint url_length = 0;
-	gint _tmp10_;
-	guint _tmp11_;
-	gchar** _tmp12_;
-	gint _tmp12__length1;
-	gchar** _tmp13_;
-	gint _tmp13__length1;
-	const gchar* _tmp51_;
-	gchar* _tmp52_;
-	const gchar* _tmp53_;
+	gint _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
+	const gchar* _tmp46_;
+	gchar* _tmp47_;
+	const gchar* _tmp48_;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self = (PublishingGallery3GetAlbumsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, "/items", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	self = (PublishingGallery3GetAlbumsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, "/items", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "scope", "all");
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = _album_urls;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1__length1 = _album_urls_length1;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_get_albums_transaction_set_album_urls (self, _tmp1_, _tmp1__length1);
+	publishing_gallery3_get_albums_transaction_set_album_urls (self, _album_urls, _album_urls_length1);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = g_strdup ("[");
+	_tmp0_ = g_strdup ("[");
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	url_list = _tmp2_;
+	url_list = _tmp0_;
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	my_album_urls = NULL;
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3567,248 +3812,241 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_my_album_urls_size_ = my_album_urls_length1;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = session;
+	_tmp1_ = publishing_rest_support_session_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = publishing_rest_support_session_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	endpoint_url = _tmp4_;
+	endpoint_url = _tmp1_;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = endpoint_url;
+	_tmp3_ = endpoint_url;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (NULL != _tmp6_) {
-#line 3549 "GalleryConnector.c"
-		const gchar* _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
+	if (NULL != _tmp3_) {
+#line 3792 "GalleryConnector.c"
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = endpoint_url;
+		_tmp4_ = endpoint_url;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = strlen (_tmp7_);
+		_tmp5_ = strlen (_tmp4_);
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = _tmp8_;
+		_tmp6_ = _tmp5_;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = _tmp9_;
-#line 3561 "GalleryConnector.c"
+		_tmp2_ = _tmp6_;
+#line 3804 "GalleryConnector.c"
 	} else {
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = 0;
-#line 3565 "GalleryConnector.c"
+		_tmp2_ = 0;
+#line 3808 "GalleryConnector.c"
 	}
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	url_length = _tmp5_;
+	url_length = _tmp2_;
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = url_length;
+	_tmp7_ = url_length;
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	url_length = _tmp10_ + 18;
+	url_length = _tmp7_ + 18;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = start;
+	_tmp8_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp8__length1);
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp12__length1);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = _tmp12_;
+	_tmp9_ = _tmp8_;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13__length1 = _tmp12__length1;
+	_tmp9__length1 = _tmp8__length1;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp11_ <= ((guint) (_tmp13__length1 - 1))) {
-#line 3583 "GalleryConnector.c"
-		guint _tmp14_;
-		const gchar* _tmp43_;
+	if (start <= ((guint) (_tmp9__length1 - 1))) {
+#line 3824 "GalleryConnector.c"
+		const gchar* _tmp38_;
+		gchar** _tmp39_;
+		gint _tmp39__length1;
+		gchar* _tmp40_;
+		gchar* _tmp41_;
+		gchar* _tmp42_;
+		guint _tmp43_;
 		gchar** _tmp44_;
 		gint _tmp44__length1;
-		gchar* _tmp45_;
-		gchar* _tmp46_;
-		gchar* _tmp47_;
-		guint _tmp48_;
-		gchar** _tmp49_;
-		gint _tmp49__length1;
-		gchar** _tmp50_;
-		gint _tmp50__length1;
+		gchar** _tmp45_;
+		gint _tmp45__length1;
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp14_ = start;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp14_);
-#line 3600 "GalleryConnector.c"
+		publishing_gallery3_get_albums_transaction_set_urls_sent (self, start);
+#line 3838 "GalleryConnector.c"
 		{
-			gboolean _tmp15_ = FALSE;
+			gboolean _tmp10_ = FALSE;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp15_ = TRUE;
+			_tmp10_ = TRUE;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			while (TRUE) {
-#line 3607 "GalleryConnector.c"
-				gchar** _tmp27_;
-				gint _tmp27__length1;
-				gchar** _tmp28_;
-				gint _tmp28__length1;
-				gchar** _tmp29_;
-				gint _tmp29__length1;
-				guint _tmp30_;
-				const gchar* _tmp31_;
-				gchar* _tmp32_;
-				gchar* _tmp33_;
-				gchar* _tmp34_;
+#line 3845 "GalleryConnector.c"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gchar** _tmp23_;
+				gint _tmp23__length1;
+				gchar** _tmp24_;
+				gint _tmp24__length1;
+				guint _tmp25_;
+				const gchar* _tmp26_;
+				gchar* _tmp27_;
+				gchar* _tmp28_;
+				gchar* _tmp29_;
+				gint _tmp30_;
+				gchar** _tmp31_;
+				gint _tmp31__length1;
+				gchar** _tmp32_;
+				gint _tmp32__length1;
+				guint _tmp33_;
+				const gchar* _tmp34_;
 				gint _tmp35_;
-				gchar** _tmp36_;
-				gint _tmp36__length1;
-				gchar** _tmp37_;
-				gint _tmp37__length1;
-				guint _tmp38_;
-				const gchar* _tmp39_;
-				gint _tmp40_;
-				gint _tmp41_;
-				guint _tmp42_;
+				gint _tmp36_;
+				guint _tmp37_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				if (!_tmp15_) {
-#line 3631 "GalleryConnector.c"
-					gboolean _tmp16_ = FALSE;
-					guint _tmp17_;
-					gchar** _tmp18_;
-					gint _tmp18__length1;
-					gchar** _tmp19_;
-					gint _tmp19__length1;
+				if (!_tmp10_) {
+#line 3869 "GalleryConnector.c"
+					gboolean _tmp11_ = FALSE;
+					guint _tmp12_;
+					gchar** _tmp13_;
+					gint _tmp13__length1;
+					gchar** _tmp14_;
+					gint _tmp14__length1;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp17_ = self->priv->_urls_sent;
+					_tmp12_ = self->priv->_urls_sent;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp18_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp18__length1);
+					_tmp13_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp13__length1);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp19_ = _tmp18_;
+					_tmp14_ = _tmp13_;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp19__length1 = _tmp18__length1;
+					_tmp14__length1 = _tmp13__length1;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					if (_tmp17_ <= ((guint) (_tmp19__length1 - 1))) {
-#line 3648 "GalleryConnector.c"
+					if (_tmp12_ <= ((guint) (_tmp14__length1 - 1))) {
+#line 3886 "GalleryConnector.c"
+						gint _tmp15_;
+						gchar** _tmp16_;
+						gint _tmp16__length1;
+						gchar** _tmp17_;
+						gint _tmp17__length1;
+						guint _tmp18_;
+						const gchar* _tmp19_;
 						gint _tmp20_;
-						gchar** _tmp21_;
-						gint _tmp21__length1;
-						gchar** _tmp22_;
-						gint _tmp22__length1;
-						guint _tmp23_;
-						const gchar* _tmp24_;
-						gint _tmp25_;
-						gint _tmp26_;
+						gint _tmp21_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp20_ = url_length;
+						_tmp15_ = url_length;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp21_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp21__length1);
+						_tmp16_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp16__length1);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp22_ = _tmp21_;
+						_tmp17_ = _tmp16_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp22__length1 = _tmp21__length1;
+						_tmp17__length1 = _tmp16__length1;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp23_ = self->priv->_urls_sent;
+						_tmp18_ = self->priv->_urls_sent;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp24_ = _tmp22_[_tmp23_];
+						_tmp19_ = _tmp17_[_tmp18_];
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp25_ = strlen (_tmp24_);
+						_tmp20_ = strlen (_tmp19_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp26_ = _tmp25_;
+						_tmp21_ = _tmp20_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp16_ = ((_tmp20_ + _tmp26_) + 3) <= 255;
-#line 3676 "GalleryConnector.c"
+						_tmp11_ = ((_tmp15_ + _tmp21_) + 3) <= 255;
+#line 3914 "GalleryConnector.c"
 					} else {
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-						_tmp16_ = FALSE;
-#line 3680 "GalleryConnector.c"
+						_tmp11_ = FALSE;
+#line 3918 "GalleryConnector.c"
 					}
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					if (!_tmp16_) {
+					if (!_tmp11_) {
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						break;
-#line 3686 "GalleryConnector.c"
+#line 3924 "GalleryConnector.c"
 					}
 				}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp15_ = FALSE;
+				_tmp10_ = FALSE;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp27_ = my_album_urls;
+				_tmp22_ = my_album_urls;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp27__length1 = my_album_urls_length1;
+				_tmp22__length1 = my_album_urls_length1;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp28_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp28__length1);
+				_tmp23_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp23__length1);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp29_ = _tmp28_;
+				_tmp24_ = _tmp23_;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp29__length1 = _tmp28__length1;
+				_tmp24__length1 = _tmp23__length1;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp30_ = self->priv->_urls_sent;
+				_tmp25_ = self->priv->_urls_sent;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp31_ = _tmp29_[_tmp30_];
+				_tmp26_ = _tmp24_[_tmp25_];
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp32_ = g_strconcat ("\"", _tmp31_, NULL);
+				_tmp27_ = g_strconcat ("\"", _tmp26_, NULL);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp33_ = _tmp32_;
+				_tmp28_ = _tmp27_;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp34_ = g_strconcat (_tmp33_, "\"", NULL);
+				_tmp29_ = g_strconcat (_tmp28_, "\"", NULL);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_vala_array_add3 (&my_album_urls, &my_album_urls_length1, &_my_album_urls_size_, _tmp34_);
+				_vala_array_add3 (&my_album_urls, &my_album_urls_length1, &_my_album_urls_size_, _tmp29_);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_g_free0 (_tmp33_);
+				_g_free0 (_tmp28_);
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp35_ = url_length;
+				_tmp30_ = url_length;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp36_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp36__length1);
+				_tmp31_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp31__length1);
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp37_ = _tmp36_;
+				_tmp32_ = _tmp31_;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp37__length1 = _tmp36__length1;
+				_tmp32__length1 = _tmp31__length1;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp38_ = self->priv->_urls_sent;
+				_tmp33_ = self->priv->_urls_sent;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp39_ = _tmp37_[_tmp38_];
+				_tmp34_ = _tmp32_[_tmp33_];
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp40_ = strlen (_tmp39_);
+				_tmp35_ = strlen (_tmp34_);
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp41_ = _tmp40_;
+				_tmp36_ = _tmp35_;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				url_length = _tmp35_ + (_tmp41_ + 3);
+				url_length = _tmp30_ + (_tmp36_ + 3);
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp42_ = self->priv->_urls_sent;
+				_tmp37_ = self->priv->_urls_sent;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp42_ + 1);
-#line 3737 "GalleryConnector.c"
+				publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp37_ + 1);
+#line 3975 "GalleryConnector.c"
 			}
 		}
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp43_ = url_list;
+		_tmp38_ = url_list;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp44_ = my_album_urls;
+		_tmp39_ = my_album_urls;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp44__length1 = my_album_urls_length1;
+		_tmp39__length1 = my_album_urls_length1;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp45_ = _vala_g_strjoinv (",", _tmp44_, _tmp44__length1);
+		_tmp40_ = _vala_g_strjoinv (",", _tmp39_, _tmp39__length1);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp46_ = _tmp45_;
+		_tmp41_ = _tmp40_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp47_ = g_strconcat (_tmp43_, _tmp46_, NULL);
+		_tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url_list);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		url_list = _tmp47_;
+		url_list = _tmp42_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_free0 (_tmp46_);
+		_g_free0 (_tmp41_);
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp48_ = self->priv->_urls_sent;
+		_tmp43_ = self->priv->_urls_sent;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp49_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp49__length1);
+		_tmp44_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp44__length1);
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp50_ = _tmp49_;
+		_tmp45_ = _tmp44_;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp50__length1 = _tmp49__length1;
+		_tmp45__length1 = _tmp44__length1;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_get_albums_transaction_set_more_urls (self, _tmp48_ <= ((guint) (_tmp50__length1 - 1)));
-#line 3768 "GalleryConnector.c"
+		publishing_gallery3_get_albums_transaction_set_more_urls (self, _tmp43_ <= ((guint) (_tmp45__length1 - 1)));
+#line 4006 "GalleryConnector.c"
 	}
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp51_ = url_list;
+	_tmp46_ = url_list;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp52_ = g_strconcat (_tmp51_, "]", NULL);
+	_tmp47_ = g_strconcat (_tmp46_, "]", NULL);
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (url_list);
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	url_list = _tmp52_;
+	url_list = _tmp47_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp53_ = url_list;
+	_tmp48_ = url_list;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "urls", _tmp53_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "urls", _tmp48_);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (endpoint_url);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3817,54 +4055,72 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 	_g_free0 (url_list);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 3790 "GalleryConnector.c"
+#line 4028 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) {
+PublishingGallery3GetAlbumsTransaction*
+publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session,
+                                                gchar** _album_urls,
+                                                int _album_urls_length1,
+                                                guint start)
+{
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_get_albums_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, session, _album_urls, _album_urls_length1, start);
-#line 3797 "GalleryConnector.c"
+#line 4040 "GalleryConnector.c"
 }
 
 
-static gpointer _publishing_gallery3_album_ref0 (gpointer self) {
+static gpointer
+_publishing_gallery3_album_ref0 (gpointer self)
+{
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? publishing_gallery3_album_ref (self) : NULL;
-#line 3804 "GalleryConnector.c"
+#line 4049 "GalleryConnector.c"
 }
 
 
-static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) {
+static void
+_vala_array_add4 (PublishingGallery3Album** * array,
+                  int* length,
+                  int* size,
+                  PublishingGallery3Album* value)
+{
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if ((*length) == (*size)) {
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*array = g_renew (PublishingGallery3Album*, *array, (*size) + 1);
-#line 3815 "GalleryConnector.c"
+#line 4065 "GalleryConnector.c"
 	}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[(*length)++] = value;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[*length] = NULL;
-#line 3821 "GalleryConnector.c"
+#line 4071 "GalleryConnector.c"
 }
 
 
-static const gchar* string_to_string (const gchar* self) {
+static const gchar*
+string_to_string (const gchar* self)
+{
 	const gchar* result = NULL;
-#line 1442 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1456 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1457 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = self;
-#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1457 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 3833 "GalleryConnector.c"
+#line 4085 "GalleryConnector.c"
 }
 
 
-PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error) {
+PublishingGallery3Album**
+publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self,
+                                                       int* result_length1,
+                                                       GError** error)
+{
 	PublishingGallery3Album** result = NULL;
 	PublishingGallery3Album** albums = NULL;
 	gint albums_length1;
@@ -3874,8 +4130,8 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 	JsonNode* _tmp0_;
 	JsonArray* members = NULL;
 	JsonArray* _tmp1_;
-	PublishingGallery3Album** _tmp23_;
-	gint _tmp23__length1;
+	PublishingGallery3Album** _tmp22_;
+	gint _tmp22__length1;
 	GError * _inner_error_ = NULL;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), NULL);
@@ -3901,7 +4157,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 			albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 3874 "GalleryConnector.c"
+#line 4130 "GalleryConnector.c"
 		} else {
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_publishing_gallery3_album_unref0 (tmp_album);
@@ -3913,45 +4169,44 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 			g_clear_error (&_inner_error_);
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 3886 "GalleryConnector.c"
+#line 4142 "GalleryConnector.c"
 		}
 	}
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = json_node_get_array (root_node);
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	members = _tmp1_;
-#line 3893 "GalleryConnector.c"
+#line 4149 "GalleryConnector.c"
 	{
 		guint i = 0U;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = (guint) 0;
-#line 3898 "GalleryConnector.c"
+#line 4154 "GalleryConnector.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp2_ = TRUE;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			while (TRUE) {
-#line 3905 "GalleryConnector.c"
+#line 4161 "GalleryConnector.c"
 				guint _tmp4_;
 				JsonArray* _tmp5_;
-				guint _tmp6_;
-				JsonArray* _tmp7_;
-				guint _tmp8_;
-				JsonObject* _tmp9_;
+				JsonArray* _tmp6_;
+				guint _tmp7_;
+				JsonObject* _tmp8_;
+				PublishingGallery3Album* _tmp9_;
 				PublishingGallery3Album* _tmp10_;
-				PublishingGallery3Album* _tmp11_;
+				gboolean _tmp11_;
 				gboolean _tmp12_;
-				gboolean _tmp13_;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp2_) {
-#line 3918 "GalleryConnector.c"
+#line 4173 "GalleryConnector.c"
 					guint _tmp3_;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp3_ = i;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					i = _tmp3_ + 1;
-#line 3924 "GalleryConnector.c"
+#line 4179 "GalleryConnector.c"
 				}
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp2_ = FALSE;
@@ -3960,98 +4215,99 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp5_ = members;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp6_ = json_array_get_length (_tmp5_);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				if (!(_tmp4_ <= (_tmp6_ - 1))) {
+				if (!(_tmp4_ <= (json_array_get_length (_tmp5_) - 1))) {
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					break;
-#line 3938 "GalleryConnector.c"
+#line 4191 "GalleryConnector.c"
 				}
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp7_ = members;
+				_tmp6_ = members;
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp8_ = i;
+				_tmp7_ = i;
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp9_ = json_array_get_object_element (_tmp7_, _tmp8_);
+				_tmp8_ = json_array_get_object_element (_tmp6_, _tmp7_);
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp10_ = publishing_gallery3_album_new (_tmp9_);
+				_tmp9_ = publishing_gallery3_album_new (_tmp8_);
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_publishing_gallery3_album_unref0 (tmp_album);
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				tmp_album = _tmp10_;
+				tmp_album = _tmp9_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp11_ = tmp_album;
+				_tmp10_ = tmp_album;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp12_ = publishing_gallery3_album_get_editable (_tmp11_);
+				_tmp11_ = publishing_gallery3_album_get_editable (_tmp10_);
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp13_ = _tmp12_;
+				_tmp12_ = _tmp11_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				if (_tmp13_) {
-#line 3960 "GalleryConnector.c"
-					PublishingGallery3Album** _tmp14_;
-					gint _tmp14__length1;
+				if (_tmp12_) {
+#line 4213 "GalleryConnector.c"
+					PublishingGallery3Album** _tmp13_;
+					gint _tmp13__length1;
+					PublishingGallery3Album* _tmp14_;
 					PublishingGallery3Album* _tmp15_;
-					PublishingGallery3Album* _tmp16_;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp14_ = albums;
+					_tmp13_ = albums;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp14__length1 = albums_length1;
+					_tmp13__length1 = albums_length1;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp15_ = tmp_album;
+					_tmp14_ = tmp_album;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_);
+					_tmp15_ = _publishing_gallery3_album_ref0 (_tmp14_);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp16_);
-#line 3975 "GalleryConnector.c"
+					_vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp15_);
+#line 4228 "GalleryConnector.c"
 				} else {
-					PublishingGallery3Album* _tmp17_;
+					PublishingGallery3Album* _tmp16_;
+					const gchar* _tmp17_;
 					const gchar* _tmp18_;
 					const gchar* _tmp19_;
-					const gchar* _tmp20_;
+					gchar* _tmp20_;
 					gchar* _tmp21_;
-					gchar* _tmp22_;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp17_ = tmp_album;
+					_tmp16_ = tmp_album;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp18_ = publishing_gallery3_album_get_title (_tmp17_);
+					_tmp17_ = publishing_gallery3_album_get_title (_tmp16_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp19_ = _tmp18_;
+					_tmp18_ = _tmp17_;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp20_ = string_to_string (_tmp19_);
+					_tmp19_ = string_to_string (_tmp18_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp21_ = g_strconcat ("Album \"", _tmp20_, "\" is not editable", NULL);
+					_tmp20_ = g_strconcat ("Album \"", _tmp19_, "\" is not editable", NULL);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp22_ = _tmp21_;
+					_tmp21_ = _tmp20_;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					g_warning ("GalleryConnector.vala:373: %s", _tmp22_);
+					g_warning ("GalleryConnector.vala:373: %s", _tmp21_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_g_free0 (_tmp22_);
-#line 3999 "GalleryConnector.c"
+					_g_free0 (_tmp21_);
+#line 4252 "GalleryConnector.c"
 				}
 			}
 		}
 	}
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23_ = albums;
+	_tmp22_ = albums;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23__length1 = albums_length1;
+	_tmp22__length1 = albums_length1;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (result_length1) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		*result_length1 = _tmp23__length1;
-#line 4012 "GalleryConnector.c"
+		*result_length1 = _tmp22__length1;
+#line 4265 "GalleryConnector.c"
 	}
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp23_;
+	result = _tmp22_;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_gallery3_album_unref0 (tmp_album);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4020 "GalleryConnector.c"
+#line 4273 "GalleryConnector.c"
 }
 
 
-gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1) {
+gchar**
+publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+                                                           int* result_length1)
+{
 	gchar** result;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
@@ -4071,65 +4327,68 @@ gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGal
 	if (result_length1) {
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*result_length1 = _tmp1__length1;
-#line 4044 "GalleryConnector.c"
+#line 4300 "GalleryConnector.c"
 	}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = _tmp1_;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4050 "GalleryConnector.c"
+#line 4306 "GalleryConnector.c"
 }
 
 
-static gchar** _vala_array_dup2 (gchar** self, int length) {
+static gchar**
+_vala_array_dup2 (gchar** self,
+                  int length)
+{
 	gchar** result;
 	int i;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	for (i = 0; i < length; i++) {
-#line 4061 "GalleryConnector.c"
+#line 4320 "GalleryConnector.c"
 		gchar* _tmp0_;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		result[i] = _tmp0_;
-#line 4067 "GalleryConnector.c"
+#line 4326 "GalleryConnector.c"
 	}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4071 "GalleryConnector.c"
+#line 4330 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1) {
+static void
+publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+                                                           gchar** value,
+                                                           int value_length1)
+{
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-	gchar** _tmp1_;
-	gint _tmp1__length1;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self));
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
+	_tmp0_ = (value != NULL) ? _vala_array_dup2 (value, value_length1) : ((gpointer) value);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0__length1 = value_length1;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_album_urls = (_vala_array_free (self->priv->_album_urls, self->priv->_album_urls_length1, (GDestroyNotify) g_free), NULL);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_album_urls = _tmp1_;
+	self->priv->_album_urls = _tmp0_;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_album_urls_length1 = _tmp1__length1;
+	self->priv->_album_urls_length1 = _tmp0__length1;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->__album_urls_size_ = self->priv->_album_urls_length1;
-#line 4098 "GalleryConnector.c"
+#line 4355 "GalleryConnector.c"
 }
 
 
-guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self) {
+guint
+publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self)
+{
 	guint result;
 	guint _tmp0_;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4140,23 +4399,25 @@ guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGaller
 	result = _tmp0_;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4113 "GalleryConnector.c"
+#line 4372 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value) {
-	guint _tmp0_;
+static void
+publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self,
+                                                          guint value)
+{
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self));
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_urls_sent = _tmp0_;
-#line 4125 "GalleryConnector.c"
+	self->priv->_urls_sent = value;
+#line 4384 "GalleryConnector.c"
 }
 
 
-gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self) {
+gboolean
+publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4167,34 +4428,38 @@ gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGal
 	result = _tmp0_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4140 "GalleryConnector.c"
+#line 4401 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value) {
-	gboolean _tmp0_;
+static void
+publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self,
+                                                          gboolean value)
+{
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self));
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_more_urls = _tmp0_;
-#line 4152 "GalleryConnector.c"
+	self->priv->_more_urls = value;
+#line 4413 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_albums_transaction_class_init (PublishingGallery3GetAlbumsTransactionClass * klass) {
+static void
+publishing_gallery3_get_albums_transaction_class_init (PublishingGallery3GetAlbumsTransactionClass * klass)
+{
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_get_albums_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_get_albums_transaction_finalize;
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (PublishingGallery3GetAlbumsTransactionPrivate));
-#line 4163 "GalleryConnector.c"
+#line 4426 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_albums_transaction_instance_init (PublishingGallery3GetAlbumsTransaction * self) {
+static void
+publishing_gallery3_get_albums_transaction_instance_init (PublishingGallery3GetAlbumsTransaction * self)
+{
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_GET_PRIVATE (self);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4207,11 +4472,13 @@ static void publishing_gallery3_get_albums_transaction_instance_init (Publishing
 	self->priv->_urls_sent = (guint) 0;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_more_urls = FALSE;
-#line 4180 "GalleryConnector.c"
+#line 4445 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingGallery3GetAlbumsTransaction * self;
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransaction);
@@ -4219,11 +4486,13 @@ static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTS
 	self->priv->_album_urls = (_vala_array_free (self->priv->_album_urls, self->priv->_album_urls_length1, (GDestroyNotify) g_free), NULL);
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_get_albums_transaction_parent_class)->finalize (obj);
-#line 4192 "GalleryConnector.c"
+#line 4459 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_get_albums_transaction_get_type (void) {
+GType
+publishing_gallery3_get_albums_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_get_albums_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_get_albums_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GetAlbumsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_get_albums_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GetAlbumsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_get_albums_transaction_instance_init, NULL };
@@ -4235,95 +4504,83 @@ GType publishing_gallery3_get_albums_transaction_get_type (void) {
 }
 
 
-static void _vala_JsonNode_free (JsonNode* self) {
+static void
+_vala_JsonNode_free (JsonNode* self)
+{
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_boxed_free (json_node_get_type (), self);
-#line 4211 "GalleryConnector.c"
+#line 4482 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name) {
+PublishingGallery3GalleryGetTagTransaction*
+publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type,
+                                                           PublishingGallery3Session* session,
+                                                           const gchar* tag_name)
+{
 	PublishingGallery3GalleryGetTagTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	gboolean _tmp1_;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (tag_name != NULL, NULL);
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp1_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:389: Not authenticated");
-#line 4231 "GalleryConnector.c"
+#line 4500 "GalleryConnector.c"
 	} else {
 		JsonGenerator* entity = NULL;
-		JsonGenerator* _tmp2_;
+		JsonGenerator* _tmp0_;
 		JsonNode* root_node = NULL;
-		JsonNode* _tmp3_;
+		JsonNode* _tmp1_;
 		JsonObject* obj = NULL;
-		JsonObject* _tmp4_;
-		PublishingGallery3Session* _tmp5_;
-		PublishingGallery3Session* _tmp6_;
-		const gchar* _tmp7_;
-		const gchar* _tmp8_;
-		PublishingGallery3Session* _tmp9_;
-		const gchar* _tmp10_;
-		const gchar* _tmp11_;
-		const gchar* _tmp12_;
+		JsonObject* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
 		gsize entity_length = 0UL;
 		gchar* entity_value = NULL;
-		gsize _tmp13_ = 0UL;
-		gchar* _tmp14_;
+		gsize _tmp7_ = 0UL;
+		gchar* _tmp8_;
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp2_ = json_generator_new ();
+		_tmp0_ = json_generator_new ();
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity = _tmp2_;
+		entity = _tmp0_;
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = json_node_new (JSON_NODE_OBJECT);
+		_tmp1_ = json_node_new (JSON_NODE_OBJECT);
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		root_node = _tmp3_;
+		root_node = _tmp1_;
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = json_object_new ();
+		_tmp2_ = json_object_new ();
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		obj = _tmp4_;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = session;
+		obj = _tmp2_;
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = session;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
+		_tmp3_ = publishing_gallery3_session_get_url (session);
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = _tmp7_;
+		_tmp4_ = _tmp3_;
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		self = (PublishingGallery3GalleryGetTagTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, "/tags", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = session;
+		self = (PublishingGallery3GalleryGetTagTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, "/tags", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = publishing_gallery3_session_get_key (_tmp9_);
+		_tmp5_ = publishing_gallery3_session_get_key (session);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = _tmp10_;
+		_tmp6_ = _tmp5_;
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp11_);
+		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_);
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = tag_name;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		json_object_set_string_member (obj, "name", _tmp12_);
+		json_object_set_string_member (obj, "name", tag_name);
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		json_node_set_object (root_node, obj);
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		json_generator_set_root (entity, root_node);
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp14_ = json_generator_to_data (entity, &_tmp13_);
+		_tmp8_ = json_generator_to_data (entity, &_tmp7_);
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity_length = _tmp13_;
+		entity_length = _tmp7_;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity_value = _tmp14_;
+		entity_value = _tmp8_;
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_debug ("GalleryConnector.vala:409: created entity: %s", entity_value);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4336,22 +4593,27 @@ PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_
 		__vala_JsonNode_free0 (root_node);
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_object_unref0 (entity);
-#line 4309 "GalleryConnector.c"
+#line 4566 "GalleryConnector.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4313 "GalleryConnector.c"
+#line 4570 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name) {
+PublishingGallery3GalleryGetTagTransaction*
+publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session,
+                                                     const gchar* tag_name)
+{
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_gallery_get_tag_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_TAG_TRANSACTION, session, tag_name);
-#line 4320 "GalleryConnector.c"
+#line 4580 "GalleryConnector.c"
 }
 
 
-gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self) {
+gchar*
+publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self)
+{
 	gchar* result = NULL;
 	JsonNode* root_node = NULL;
 	gchar* url = NULL;
@@ -4361,7 +4623,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
 	GError * _inner_error_ = NULL;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_GET_TAG_TRANSACTION (self), NULL);
-#line 4334 "GalleryConnector.c"
+#line 4596 "GalleryConnector.c"
 	{
 		JsonNode* _tmp0_ = NULL;
 		JsonNode* _tmp1_;
@@ -4373,7 +4635,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4346 "GalleryConnector.c"
+#line 4608 "GalleryConnector.c"
 				goto __catch2_spit_publishing_publishing_error;
 			}
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4384,11 +4646,11 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
 			g_clear_error (&_inner_error_);
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 4357 "GalleryConnector.c"
+#line 4619 "GalleryConnector.c"
 		}
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		root_node = _tmp0_;
-#line 4361 "GalleryConnector.c"
+#line 4623 "GalleryConnector.c"
 	}
 	goto __finally2;
 	__catch2_spit_publishing_publishing_error:
@@ -4402,7 +4664,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
 		g_error ("GalleryConnector.vala:425: Could not get root node");
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (e);
-#line 4375 "GalleryConnector.c"
+#line 4637 "GalleryConnector.c"
 	}
 	__finally2:
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4415,7 +4677,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
 		g_clear_error (&_inner_error_);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return NULL;
-#line 4388 "GalleryConnector.c"
+#line 4650 "GalleryConnector.c"
 	}
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp2_ = json_node_get_object (root_node);
@@ -4431,22 +4693,28 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
 	result = url;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4404 "GalleryConnector.c"
+#line 4666 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_get_tag_transaction_class_init (PublishingGallery3GalleryGetTagTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_get_tag_transaction_class_init (PublishingGallery3GalleryGetTagTransactionClass * klass)
+{
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_get_tag_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 4411 "GalleryConnector.c"
+#line 4675 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_get_tag_transaction_instance_init (PublishingGallery3GalleryGetTagTransaction * self) {
+static void
+publishing_gallery3_gallery_get_tag_transaction_instance_init (PublishingGallery3GalleryGetTagTransaction * self)
+{
 }
 
 
-GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_get_tag_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_gallery_get_tag_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_gallery_get_tag_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryGetTagTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_get_tag_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryGetTagTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_get_tag_transaction_instance_init, NULL };
@@ -4458,34 +4726,37 @@ GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) {
 }
 
 
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url) {
+PublishingGallery3GalleryGetItemTagsURLsTransaction*
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type,
+                                                                       PublishingGallery3Session* session,
+                                                                       const gchar* item_url)
+{
 	PublishingGallery3GalleryGetItemTagsURLsTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	const gchar* _tmp1_;
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (item_url != NULL, NULL);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = item_url;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, item_url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4447 "GalleryConnector.c"
+#line 4713 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url) {
+PublishingGallery3GalleryGetItemTagsURLsTransaction*
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session,
+                                                                 const gchar* item_url)
+{
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, session, item_url);
-#line 4454 "GalleryConnector.c"
+#line 4723 "GalleryConnector.c"
 }
 
 
-gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self) {
+gchar*
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self)
+{
 	gchar* result = NULL;
 	JsonNode* root_node = NULL;
 	JsonObject* relationships = NULL;
@@ -4500,7 +4771,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 	_tmp0_ = self->priv->item_tags_path;
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (g_strcmp0 ("", _tmp0_) == 0) {
-#line 4473 "GalleryConnector.c"
+#line 4744 "GalleryConnector.c"
 		JsonNode* _tmp3_;
 		JsonObject* _tmp4_;
 		JsonObject* _tmp5_;
@@ -4522,7 +4793,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4495 "GalleryConnector.c"
+#line 4766 "GalleryConnector.c"
 					goto __catch3_spit_publishing_publishing_error;
 				}
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4531,11 +4802,11 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 				g_clear_error (&_inner_error_);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				return NULL;
-#line 4504 "GalleryConnector.c"
+#line 4775 "GalleryConnector.c"
 			}
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			root_node = _tmp1_;
-#line 4508 "GalleryConnector.c"
+#line 4779 "GalleryConnector.c"
 		}
 		goto __finally3;
 		__catch3_spit_publishing_publishing_error:
@@ -4549,7 +4820,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 			g_error ("GalleryConnector.vala:461: Could not get root node");
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_error_free0 (e);
-#line 4522 "GalleryConnector.c"
+#line 4793 "GalleryConnector.c"
 		}
 		__finally3:
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4560,7 +4831,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 			g_clear_error (&_inner_error_);
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 4533 "GalleryConnector.c"
+#line 4804 "GalleryConnector.c"
 		}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = root_node;
@@ -4594,7 +4865,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 		_g_free0 (self->priv->item_tags_path);
 #line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		self->priv->item_tags_path = _tmp12_;
-#line 4567 "GalleryConnector.c"
+#line 4838 "GalleryConnector.c"
 	}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp13_ = self->priv->item_tags_path;
@@ -4604,22 +4875,26 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 	result = _tmp14_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4577 "GalleryConnector.c"
+#line 4848 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init (PublishingGallery3GalleryGetItemTagsURLsTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init (PublishingGallery3GalleryGetItemTagsURLsTransactionClass * klass)
+{
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryGetItemTagsURLsTransactionPrivate));
-#line 4588 "GalleryConnector.c"
+#line 4861 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self) {
+static void
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self)
+{
 	gchar* _tmp0_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_GET_PRIVATE (self);
@@ -4627,11 +4902,13 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance
 	_tmp0_ = g_strdup ("");
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->item_tags_path = _tmp0_;
-#line 4600 "GalleryConnector.c"
+#line 4875 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingGallery3GalleryGetItemTagsURLsTransaction * self;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, PublishingGallery3GalleryGetItemTagsURLsTransaction);
@@ -4639,11 +4916,13 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize
 	_g_free0 (self->priv->item_tags_path);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_parent_class)->finalize (obj);
-#line 4612 "GalleryConnector.c"
+#line 4889 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryGetItemTagsURLsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryGetItemTagsURLsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init, NULL };
@@ -4655,10 +4934,14 @@ GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void
 }
 
 
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) {
+PublishingGallery3GallerySetTagRelationshipTransaction*
+publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type,
+                                                                        PublishingGallery3Session* session,
+                                                                        const gchar* item_tags_path,
+                                                                        const gchar* tag_url,
+                                                                        const gchar* item_url)
+{
 	PublishingGallery3GallerySetTagRelationshipTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	gboolean _tmp1_;
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4668,87 +4951,65 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (item_url != NULL, NULL);
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp1_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:489: Not authenticated");
-#line 4648 "GalleryConnector.c"
+#line 4927 "GalleryConnector.c"
 	} else {
 		JsonGenerator* entity = NULL;
-		JsonGenerator* _tmp2_;
+		JsonGenerator* _tmp0_;
 		JsonNode* root_node = NULL;
-		JsonNode* _tmp3_;
+		JsonNode* _tmp1_;
 		JsonObject* obj = NULL;
-		JsonObject* _tmp4_;
-		PublishingGallery3Session* _tmp5_;
-		PublishingGallery3Session* _tmp6_;
-		const gchar* _tmp7_;
-		const gchar* _tmp8_;
-		const gchar* _tmp9_;
-		PublishingGallery3Session* _tmp10_;
-		const gchar* _tmp11_;
-		const gchar* _tmp12_;
-		const gchar* _tmp13_;
-		const gchar* _tmp14_;
+		JsonObject* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
 		gsize entity_length = 0UL;
 		gchar* entity_value = NULL;
-		gsize _tmp15_ = 0UL;
-		gchar* _tmp16_;
+		gsize _tmp7_ = 0UL;
+		gchar* _tmp8_;
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp2_ = json_generator_new ();
+		_tmp0_ = json_generator_new ();
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity = _tmp2_;
+		entity = _tmp0_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = json_node_new (JSON_NODE_OBJECT);
+		_tmp1_ = json_node_new (JSON_NODE_OBJECT);
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		root_node = _tmp3_;
+		root_node = _tmp1_;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = json_object_new ();
+		_tmp2_ = json_object_new ();
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		obj = _tmp4_;
+		obj = _tmp2_;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = session;
+		_tmp3_ = publishing_gallery3_session_get_url (session);
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = session;
+		_tmp4_ = _tmp3_;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = _tmp7_;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = item_tags_path;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		self = (PublishingGallery3GallerySetTagRelationshipTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, _tmp9_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+		self = (PublishingGallery3GallerySetTagRelationshipTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, item_tags_path, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = session;
+		_tmp5_ = publishing_gallery3_session_get_key (session);
 #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = publishing_gallery3_session_get_key (_tmp10_);
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = _tmp11_;
+		_tmp6_ = _tmp5_;
 #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp12_);
+		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_);
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = tag_url;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		json_object_set_string_member (obj, "tag", _tmp13_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp14_ = item_url;
+		json_object_set_string_member (obj, "tag", tag_url);
 #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		json_object_set_string_member (obj, "item", _tmp14_);
+		json_object_set_string_member (obj, "item", item_url);
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		json_node_set_object (root_node, obj);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		json_generator_set_root (entity, root_node);
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp16_ = json_generator_to_data (entity, &_tmp15_);
+		_tmp8_ = json_generator_to_data (entity, &_tmp7_);
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity_length = _tmp15_;
+		entity_length = _tmp7_;
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity_value = _tmp16_;
+		entity_value = _tmp8_;
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_debug ("GalleryConnector.vala:510: created entity: %s", entity_value);
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4761,33 +5022,44 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall
 		__vala_JsonNode_free0 (root_node);
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_object_unref0 (entity);
-#line 4734 "GalleryConnector.c"
+#line 4995 "GalleryConnector.c"
 	}
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4738 "GalleryConnector.c"
+#line 4999 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) {
+PublishingGallery3GallerySetTagRelationshipTransaction*
+publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session,
+                                                                  const gchar* item_tags_path,
+                                                                  const gchar* tag_url,
+                                                                  const gchar* item_url)
+{
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_gallery_set_tag_relationship_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION, session, item_tags_path, tag_url, item_url);
-#line 4745 "GalleryConnector.c"
+#line 5011 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_set_tag_relationship_transaction_class_init (PublishingGallery3GallerySetTagRelationshipTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_set_tag_relationship_transaction_class_init (PublishingGallery3GallerySetTagRelationshipTransactionClass * klass)
+{
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_set_tag_relationship_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 4752 "GalleryConnector.c"
+#line 5020 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init (PublishingGallery3GallerySetTagRelationshipTransaction * self) {
+static void
+publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init (PublishingGallery3GallerySetTagRelationshipTransaction * self)
+{
 }
 
 
-GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_gallery_set_tag_relationship_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_gallery_set_tag_relationship_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GallerySetTagRelationshipTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_set_tag_relationship_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GallerySetTagRelationshipTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init, NULL };
@@ -4799,124 +5071,101 @@ GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (voi
 }
 
 
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3GalleryAlbumCreateTransaction*
+publishing_gallery3_gallery_album_create_transaction_construct (GType object_type,
+                                                                PublishingGallery3Session* session,
+                                                                PublishingGallery3PublishingParameters* parameters)
+{
 	PublishingGallery3GalleryAlbumCreateTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	gboolean _tmp1_;
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (parameters), NULL);
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp1_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:533: Not authenticated");
-#line 4788 "GalleryConnector.c"
+#line 5058 "GalleryConnector.c"
 	} else {
 		JsonGenerator* entity = NULL;
-		JsonGenerator* _tmp2_;
+		JsonGenerator* _tmp0_;
 		JsonNode* root_node = NULL;
-		JsonNode* _tmp3_;
+		JsonNode* _tmp1_;
 		JsonObject* obj = NULL;
-		JsonObject* _tmp4_;
-		PublishingGallery3Session* _tmp5_;
-		PublishingGallery3Session* _tmp6_;
+		JsonObject* _tmp2_;
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
 		const gchar* _tmp7_;
 		const gchar* _tmp8_;
-		PublishingGallery3Session* _tmp9_;
+		gchar* _tmp9_;
 		const gchar* _tmp10_;
 		const gchar* _tmp11_;
-		PublishingGallery3Session* _tmp12_;
+		const gchar* _tmp12_;
 		const gchar* _tmp13_;
-		const gchar* _tmp14_;
-		gchar* _tmp15_;
-		PublishingGallery3PublishingParameters* _tmp16_;
-		PublishingGallery3PublishingParameters* _tmp17_;
-		const gchar* _tmp18_;
-		const gchar* _tmp19_;
-		PublishingGallery3PublishingParameters* _tmp20_;
-		const gchar* _tmp21_;
-		const gchar* _tmp22_;
 		gchar* entity_value = NULL;
-		gchar* _tmp23_;
+		gchar* _tmp14_;
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp2_ = json_generator_new ();
+		_tmp0_ = json_generator_new ();
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity = _tmp2_;
+		entity = _tmp0_;
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = json_node_new (JSON_NODE_OBJECT);
+		_tmp1_ = json_node_new (JSON_NODE_OBJECT);
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		root_node = _tmp3_;
+		root_node = _tmp1_;
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = json_object_new ();
+		_tmp2_ = json_object_new ();
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		obj = _tmp4_;
+		obj = _tmp2_;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = session;
+		_tmp3_ = publishing_gallery3_session_get_url (session);
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = session;
+		_tmp4_ = _tmp3_;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = _tmp7_;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		self = (PublishingGallery3GalleryAlbumCreateTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+		self = (PublishingGallery3GalleryAlbumCreateTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = session;
+		_tmp5_ = publishing_gallery3_session_get_key (session);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = publishing_gallery3_session_get_key (_tmp9_);
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = _tmp10_;
+		_tmp6_ = _tmp5_;
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp11_);
+		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_);
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = session;
+		_tmp7_ = publishing_gallery3_session_get_url (session);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = publishing_gallery3_session_get_url (_tmp12_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp14_ = _tmp13_;
+		_tmp8_ = _tmp7_;
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp15_ = g_strdup (_tmp14_);
+		_tmp9_ = g_strdup (_tmp8_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (self->priv->session_url);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		self->priv->session_url = _tmp15_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp16_ = parameters;
+		self->priv->session_url = _tmp9_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_album_create_transaction_set_parameters (self, _tmp16_);
+		publishing_gallery3_gallery_album_create_transaction_set_parameters (self, parameters);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp17_ = parameters;
+		_tmp10_ = publishing_gallery3_publishing_parameters_get_album_name (parameters);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp18_ = publishing_gallery3_publishing_parameters_get_album_name (_tmp17_);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp19_ = _tmp18_;
+		_tmp11_ = _tmp10_;
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		json_object_set_string_member (obj, "name", _tmp19_);
+		json_object_set_string_member (obj, "name", _tmp11_);
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		json_object_set_string_member (obj, "type", "album");
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp20_ = parameters;
+		_tmp12_ = publishing_gallery3_publishing_parameters_get_album_title (parameters);
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp21_ = publishing_gallery3_publishing_parameters_get_album_title (_tmp20_);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp22_ = _tmp21_;
+		_tmp13_ = _tmp12_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		json_object_set_string_member (obj, "title", _tmp22_);
+		json_object_set_string_member (obj, "title", _tmp13_);
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		json_node_set_object (root_node, obj);
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		json_generator_set_root (entity, root_node);
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp23_ = json_generator_to_data (entity, NULL);
+		_tmp14_ = json_generator_to_data (entity, NULL);
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		entity_value = _tmp23_;
+		entity_value = _tmp14_;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_debug ("GalleryConnector.vala:556: created entity: %s", entity_value);
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4929,22 +5178,27 @@ PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_alb
 		__vala_JsonNode_free0 (root_node);
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_object_unref0 (entity);
-#line 4902 "GalleryConnector.c"
+#line 5151 "GalleryConnector.c"
 	}
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4906 "GalleryConnector.c"
+#line 5155 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3GalleryAlbumCreateTransaction*
+publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session,
+                                                          PublishingGallery3PublishingParameters* parameters)
+{
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_gallery_album_create_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, session, parameters);
-#line 4913 "GalleryConnector.c"
+#line 5165 "GalleryConnector.c"
 }
 
 
-gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self) {
+gchar*
+publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self)
+{
 	gchar* result = NULL;
 	JsonNode* root_node = NULL;
 	gchar* new_path = NULL;
@@ -4956,7 +5210,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
 	GError * _inner_error_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self), NULL);
-#line 4929 "GalleryConnector.c"
+#line 5183 "GalleryConnector.c"
 	{
 		JsonNode* _tmp0_ = NULL;
 		JsonNode* _tmp1_;
@@ -4968,7 +5222,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4941 "GalleryConnector.c"
+#line 5195 "GalleryConnector.c"
 				goto __catch4_spit_publishing_publishing_error;
 			}
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4979,11 +5233,11 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
 			g_clear_error (&_inner_error_);
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 4952 "GalleryConnector.c"
+#line 5206 "GalleryConnector.c"
 		}
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		root_node = _tmp0_;
-#line 4956 "GalleryConnector.c"
+#line 5210 "GalleryConnector.c"
 	}
 	goto __finally4;
 	__catch4_spit_publishing_publishing_error:
@@ -4997,7 +5251,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
 		g_error ("GalleryConnector.vala:572: Could not get root node");
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (e);
-#line 4970 "GalleryConnector.c"
+#line 5224 "GalleryConnector.c"
 	}
 	__finally4:
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5010,7 +5264,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
 		g_clear_error (&_inner_error_);
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return NULL;
-#line 4983 "GalleryConnector.c"
+#line 5237 "GalleryConnector.c"
 	}
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp2_ = json_node_get_object (root_node);
@@ -5034,11 +5288,13 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
 	result = new_path;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 5007 "GalleryConnector.c"
+#line 5261 "GalleryConnector.c"
 }
 
 
-PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self)
+{
 	PublishingGallery3PublishingParameters* result;
 	PublishingGallery3PublishingParameters* _tmp0_;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5049,53 +5305,61 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create
 	result = _tmp0_;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 5022 "GalleryConnector.c"
+#line 5278 "GalleryConnector.c"
 }
 
 
-static gpointer _publishing_gallery3_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_gallery3_publishing_parameters_ref0 (gpointer self)
+{
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? publishing_gallery3_publishing_parameters_ref (self) : NULL;
-#line 5029 "GalleryConnector.c"
+#line 5287 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value) {
+static void
+publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self,
+                                                                     PublishingGallery3PublishingParameters* value)
+{
 	PublishingGallery3PublishingParameters* _tmp0_;
-	PublishingGallery3PublishingParameters* _tmp1_;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self));
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp0_);
+	_tmp0_ = _publishing_gallery3_publishing_parameters_ref0 (value);
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_gallery3_publishing_parameters_unref0 (self->priv->_parameters);
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_parameters = _tmp1_;
-#line 5046 "GalleryConnector.c"
+	self->priv->_parameters = _tmp0_;
+#line 5304 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_album_create_transaction_class_init (PublishingGallery3GalleryAlbumCreateTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_album_create_transaction_class_init (PublishingGallery3GalleryAlbumCreateTransactionClass * klass)
+{
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_album_create_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_album_create_transaction_finalize;
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryAlbumCreateTransactionPrivate));
-#line 5057 "GalleryConnector.c"
+#line 5317 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_album_create_transaction_instance_init (PublishingGallery3GalleryAlbumCreateTransaction * self) {
+static void
+publishing_gallery3_gallery_album_create_transaction_instance_init (PublishingGallery3GalleryAlbumCreateTransaction * self)
+{
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_GET_PRIVATE (self);
-#line 5064 "GalleryConnector.c"
+#line 5326 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingGallery3GalleryAlbumCreateTransaction * self;
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, PublishingGallery3GalleryAlbumCreateTransaction);
@@ -5105,11 +5369,13 @@ static void publishing_gallery3_gallery_album_create_transaction_finalize (Publi
 	_g_free0 (self->priv->session_url);
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_album_create_transaction_parent_class)->finalize (obj);
-#line 5078 "GalleryConnector.c"
+#line 5342 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_gallery_album_create_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_album_create_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_gallery_album_create_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_gallery_album_create_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryAlbumCreateTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_album_create_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryAlbumCreateTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_album_create_transaction_instance_init, NULL };
@@ -5121,86 +5387,81 @@ GType publishing_gallery3_gallery_album_create_transaction_get_type (void) {
 }
 
 
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_session_ref0 (gpointer self)
+{
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5097 "GalleryConnector.c"
+#line 5365 "GalleryConnector.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	var = (g_free (var), NULL);
-#line 5104 "GalleryConnector.c"
+#line 5374 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingGallery3GalleryUploadTransaction*
+publishing_gallery3_gallery_upload_transaction_construct (GType object_type,
+                                                          PublishingGallery3Session* session,
+                                                          PublishingGallery3PublishingParameters* parameters,
+                                                          SpitPublishingPublishable* publishable)
+{
 	PublishingGallery3GalleryUploadTransaction* self = NULL;
-	PublishingGallery3PublishingParameters* _tmp0_;
+	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar _tmp3_;
-	PublishingGallery3Session* _tmp7_;
-	SpitPublishingPublishable* _tmp8_;
-	PublishingGallery3Session* _tmp9_;
-	const gchar* _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	gchar* _tmp13_;
-	PublishingGallery3PublishingParameters* _tmp14_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	PublishingGallery3PublishingParameters* _tmp12_;
+	PublishingGallery3Session* _tmp13_;
+	const gchar* _tmp14_;
 	const gchar* _tmp15_;
-	const gchar* _tmp16_;
-	gchar* _tmp17_;
-	gchar* _tmp18_;
-	PublishingGallery3PublishingParameters* _tmp19_;
-	PublishingGallery3PublishingParameters* _tmp20_;
-	PublishingGallery3Session* _tmp21_;
-	PublishingGallery3Session* _tmp22_;
-	PublishingGallery3Session* _tmp23_;
-	const gchar* _tmp24_;
-	const gchar* _tmp25_;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp26_;
-	GEqualFunc _tmp27_;
-	GHashTable* _tmp28_;
+	GHashFunc _tmp16_;
+	GEqualFunc _tmp17_;
+	GHashTable* _tmp18_;
 	gchar* title = NULL;
-	SpitPublishingPublishable* _tmp29_;
-	gchar* _tmp30_;
+	gchar* _tmp19_;
 	gchar* filename = NULL;
-	SpitPublishingPublishable* _tmp31_;
+	gchar* _tmp20_;
+	gboolean _tmp21_ = FALSE;
+	const gchar* _tmp22_;
+	GHashTable* _tmp26_;
+	gchar* _tmp27_;
+	const gchar* _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	GHashTable* _tmp31_;
 	gchar* _tmp32_;
-	gboolean _tmp33_ = FALSE;
-	const gchar* _tmp34_;
-	GHashTable* _tmp38_;
-	gchar* _tmp39_;
-	const gchar* _tmp40_;
-	const gchar* _tmp41_;
-	gchar* _tmp42_;
-	GHashTable* _tmp43_;
-	gchar* _tmp44_;
-	gchar* _tmp45_;
-	GHashTable* _tmp46_;
-	JsonGenerator* _tmp47_;
+	gchar* _tmp33_;
+	GHashTable* _tmp34_;
+	JsonGenerator* _tmp35_;
 	gchar* desc = NULL;
-	SpitPublishingPublishable* _tmp48_;
-	gchar* _tmp49_;
-	const gchar* _tmp50_ = NULL;
-	SpitPublishingPublishable* _tmp51_;
-	SpitPublishingPublisherMediaType _tmp52_;
+	gchar* _tmp36_;
+	const gchar* _tmp37_ = NULL;
 	gchar* type = NULL;
-	gchar* _tmp53_;
+	gchar* _tmp38_;
 	JsonNode* root_node = NULL;
-	JsonNode* _tmp54_;
+	JsonNode* _tmp39_;
 	JsonObject* obj = NULL;
-	JsonObject* _tmp55_;
-	const gchar* _tmp56_;
-	const gchar* _tmp57_;
-	const gchar* _tmp58_;
-	JsonGenerator* _tmp59_;
-	JsonGenerator* _tmp60_;
-	gchar* _tmp61_;
-	gchar* _tmp62_;
+	JsonObject* _tmp40_;
+	const gchar* _tmp41_;
+	const gchar* _tmp42_;
+	const gchar* _tmp43_;
+	JsonGenerator* _tmp44_;
+	JsonGenerator* _tmp45_;
+	gchar* _tmp46_;
+	gchar* _tmp47_;
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5208,229 +5469,198 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = parameters;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp0_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = _tmp1_;
+	_tmp0_ = publishing_gallery3_publishing_parameters_get_album_path (parameters);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = string_get (_tmp2_, (glong) 0);
+	_tmp1_ = _tmp0_;
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp3_ != '/') {
-#line 5190 "GalleryConnector.c"
-		PublishingGallery3PublishingParameters* _tmp4_;
-		const gchar* _tmp5_;
-		const gchar* _tmp6_;
+	if (string_get (_tmp1_, (glong) 0) != '/') {
+#line 5447 "GalleryConnector.c"
+		const gchar* _tmp2_;
+		const gchar* _tmp3_;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_warning ("GalleryConnector.vala:601: Bad upload item path, this is a bug!");
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = parameters;
+		_tmp2_ = publishing_gallery3_publishing_parameters_get_album_path (parameters);
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp4_);
+		_tmp3_ = _tmp2_;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = _tmp5_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		g_error ("GalleryConnector.vala:602: %s", _tmp6_);
-#line 5204 "GalleryConnector.c"
+		g_error ("GalleryConnector.vala:602: %s", _tmp3_);
+#line 5458 "GalleryConnector.c"
 	}
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = session;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishable;
+	_tmp4_ = publishing_gallery3_session_get_url (session);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = session;
+	_tmp5_ = _tmp4_;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = publishing_gallery3_session_get_url (_tmp9_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = _tmp10_;
+	_tmp6_ = g_strconcat (_tmp5_, PUBLISHING_GALLERY3_REST_PATH, NULL);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = g_strconcat (_tmp11_, PUBLISHING_GALLERY3_REST_PATH, NULL);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = _tmp12_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = parameters;
+	_tmp7_ = _tmp6_;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp14_);
+	_tmp8_ = publishing_gallery3_publishing_parameters_get_album_path (parameters);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = _tmp15_;
+	_tmp9_ = _tmp8_;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL);
+	_tmp10_ = g_strconcat (_tmp7_, _tmp9_, NULL);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = _tmp17_;
+	_tmp11_ = _tmp10_;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self = (PublishingGallery3GalleryUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp8_, _tmp18_);
+	self = (PublishingGallery3GalleryUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, _tmp11_);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp18_);
+	_g_free0 (_tmp11_);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp13_);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = parameters;
+	_g_free0 (_tmp7_);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp19_);
+	_tmp12_ = _publishing_gallery3_publishing_parameters_ref0 (parameters);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_gallery3_publishing_parameters_unref0 (self->priv->parameters);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->parameters = _tmp20_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp21_ = session;
+	self->priv->parameters = _tmp12_;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp22_ = _publishing_rest_support_session_ref0 (_tmp21_);
+	_tmp13_ = _publishing_rest_support_session_ref0 (session);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->session = _tmp22_;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23_ = session;
+	self->priv->session = _tmp13_;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp24_ = publishing_gallery3_session_get_key (_tmp23_);
+	_tmp14_ = publishing_gallery3_session_get_key (session);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp25_ = _tmp24_;
+	_tmp15_ = _tmp14_;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp25_);
+	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp15_);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp26_ = g_str_hash;
+	_tmp16_ = g_str_hash;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp27_ = g_str_equal;
+	_tmp17_ = g_str_equal;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp28_ = g_hash_table_new_full (_tmp26_, _tmp27_, _g_free0_, _g_free0_);
+	_tmp18_ = g_hash_table_new_full (_tmp16_, _tmp17_, _g_free0_, _g_free0_);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	disposition_table = _tmp28_;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp29_ = publishable;
+	disposition_table = _tmp18_;
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp30_ = spit_publishing_publishable_get_publishing_name (_tmp29_);
+	_tmp19_ = spit_publishing_publishable_get_publishing_name (publishable);
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	title = _tmp30_;
+	title = _tmp19_;
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp31_ = publishable;
+	_tmp20_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp32_ = spit_publishing_publishable_get_param_string (_tmp31_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	filename = _tmp32_;
+	filename = _tmp20_;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp34_ = title;
+	_tmp22_ = title;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp34_ == NULL) {
+	if (_tmp22_ == NULL) {
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp33_ = TRUE;
-#line 5288 "GalleryConnector.c"
+		_tmp21_ = TRUE;
+#line 5524 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp35_;
+		const gchar* _tmp23_;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp35_ = title;
+		_tmp23_ = title;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp33_ = g_strcmp0 (_tmp35_, "") == 0;
-#line 5295 "GalleryConnector.c"
+		_tmp21_ = g_strcmp0 (_tmp23_, "") == 0;
+#line 5531 "GalleryConnector.c"
 	}
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp33_) {
-#line 5299 "GalleryConnector.c"
-		const gchar* _tmp36_;
-		gchar* _tmp37_;
+	if (_tmp21_) {
+#line 5535 "GalleryConnector.c"
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp36_ = filename;
+		_tmp24_ = filename;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp37_ = g_strdup (_tmp36_);
+		_tmp25_ = g_strdup (_tmp24_);
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (title);
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		title = _tmp37_;
-#line 5310 "GalleryConnector.c"
+		title = _tmp25_;
+#line 5546 "GalleryConnector.c"
 	}
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp38_ = disposition_table;
+	_tmp26_ = disposition_table;
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp39_ = g_strdup ("filename");
+	_tmp27_ = g_strdup ("filename");
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp40_ = filename;
+	_tmp28_ = filename;
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp41_ = string_to_string (_tmp40_);
+	_tmp29_ = string_to_string (_tmp28_);
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp42_ = g_strdup (_tmp41_);
+	_tmp30_ = g_strdup (_tmp29_);
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_hash_table_insert (_tmp38_, _tmp39_, _tmp42_);
+	g_hash_table_insert (_tmp26_, _tmp27_, _tmp30_);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp43_ = disposition_table;
+	_tmp31_ = disposition_table;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp44_ = g_strdup ("name");
+	_tmp32_ = g_strdup ("name");
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp45_ = g_strdup ("file");
+	_tmp33_ = g_strdup ("file");
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_hash_table_insert (_tmp43_, _tmp44_, _tmp45_);
+	g_hash_table_insert (_tmp31_, _tmp32_, _tmp33_);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp46_ = disposition_table;
+	_tmp34_ = disposition_table;
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp46_);
+	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp34_);
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp47_ = json_generator_new ();
+	_tmp35_ = json_generator_new ();
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->generator);
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->generator = _tmp47_;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp48_ = publishable;
+	self->priv->generator = _tmp35_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp49_ = spit_publishing_publishable_get_param_string (_tmp48_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
+	_tmp36_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	desc = _tmp49_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp51_ = publishable;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp52_ = spit_publishing_publishable_get_media_type (_tmp51_);
+	desc = _tmp36_;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp52_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+	if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp50_ = "movie";
-#line 5356 "GalleryConnector.c"
+		_tmp37_ = "movie";
+#line 5586 "GalleryConnector.c"
 	} else {
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp50_ = "photo";
-#line 5360 "GalleryConnector.c"
+		_tmp37_ = "photo";
+#line 5590 "GalleryConnector.c"
 	}
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp53_ = g_strdup (_tmp50_);
+	_tmp38_ = g_strdup (_tmp37_);
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	type = _tmp53_;
+	type = _tmp38_;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp54_ = json_node_new (JSON_NODE_OBJECT);
+	_tmp39_ = json_node_new (JSON_NODE_OBJECT);
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	root_node = _tmp54_;
+	root_node = _tmp39_;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp55_ = json_object_new ();
+	_tmp40_ = json_object_new ();
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	obj = _tmp55_;
+	obj = _tmp40_;
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp56_ = filename;
+	_tmp41_ = filename;
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	json_object_set_string_member (obj, "name", _tmp56_);
+	json_object_set_string_member (obj, "name", _tmp41_);
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	json_object_set_string_member (obj, "type", type);
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp57_ = title;
+	_tmp42_ = title;
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	json_object_set_string_member (obj, "title", _tmp57_);
+	json_object_set_string_member (obj, "title", _tmp42_);
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp58_ = desc;
+	_tmp43_ = desc;
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	json_object_set_string_member (obj, "description", _tmp58_);
+	json_object_set_string_member (obj, "description", _tmp43_);
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	json_node_set_object (root_node, obj);
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp59_ = self->priv->generator;
+	_tmp44_ = self->priv->generator;
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	json_generator_set_root (_tmp59_, root_node);
+	json_generator_set_root (_tmp44_, root_node);
 #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp60_ = self->priv->generator;
+	_tmp45_ = self->priv->generator;
 #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp61_ = json_generator_to_data (_tmp60_, NULL);
+	_tmp46_ = json_generator_to_data (_tmp45_, NULL);
 #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp62_ = _tmp61_;
+	_tmp47_ = _tmp46_;
 #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "entity", _tmp62_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "entity", _tmp47_);
 #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp62_);
+	_g_free0 (_tmp47_);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_json_object_unref0 (obj);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5447,18 +5677,24 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
 	_g_hash_table_unref0 (disposition_table);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 5420 "GalleryConnector.c"
+#line 5650 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingGallery3GalleryUploadTransaction*
+publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session,
+                                                    PublishingGallery3PublishingParameters* parameters,
+                                                    SpitPublishingPublishable* publishable)
+{
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_gallery_upload_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 5427 "GalleryConnector.c"
+#line 5661 "GalleryConnector.c"
 }
 
 
-static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self) {
+static gchar*
+publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self)
+{
 	gchar* result = NULL;
 	gchar* json_object = NULL;
 	gchar* new_url = NULL;
@@ -5472,11 +5708,10 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 	JsonParser* _tmp14_;
 	JsonNode* _tmp15_;
 	JsonNode* _tmp16_;
-	gboolean _tmp17_;
-	JsonNode* _tmp19_;
-	JsonObject* _tmp20_;
-	const gchar* _tmp21_;
-	gchar* _tmp22_;
+	JsonNode* _tmp18_;
+	JsonObject* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL);
@@ -5496,7 +5731,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 	if (NULL == _tmp3_) {
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp2_ = TRUE;
-#line 5469 "GalleryConnector.c"
+#line 5704 "GalleryConnector.c"
 	} else {
 		const gchar* _tmp4_;
 		gint _tmp5_;
@@ -5509,11 +5744,11 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 		_tmp6_ = _tmp5_;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp2_ = 0 == _tmp6_;
-#line 5482 "GalleryConnector.c"
+#line 5717 "GalleryConnector.c"
 	}
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp2_) {
-#line 5486 "GalleryConnector.c"
+#line 5721 "GalleryConnector.c"
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
@@ -5537,13 +5772,13 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 		_g_free0 (json_object);
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return result;
-#line 5510 "GalleryConnector.c"
+#line 5745 "GalleryConnector.c"
 	}
 #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp10_ = json_object;
 #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:664: json_object: %s", _tmp10_);
-#line 5516 "GalleryConnector.c"
+#line 5751 "GalleryConnector.c"
 	{
 		JsonParser* _tmp11_;
 		const gchar* _tmp12_;
@@ -5555,7 +5790,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 		json_parser_load_from_data (_tmp11_, _tmp12_, (gssize) -1, &_inner_error_);
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5528 "GalleryConnector.c"
+#line 5763 "GalleryConnector.c"
 			goto __catch5_g_error;
 		}
 	}
@@ -5578,7 +5813,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 		g_error ("GalleryConnector.vala:674: %s", _tmp13_);
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (e);
-#line 5551 "GalleryConnector.c"
+#line 5786 "GalleryConnector.c"
 	}
 	__finally5:
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5595,7 +5830,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 		g_clear_error (&_inner_error_);
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return NULL;
-#line 5568 "GalleryConnector.c"
+#line 5803 "GalleryConnector.c"
 	}
 #line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp14_ = parser;
@@ -5606,18 +5841,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp16_ = root_node;
 #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = json_node_is_null (_tmp16_);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp17_) {
-#line 5582 "GalleryConnector.c"
-		gchar* _tmp18_;
+	if (json_node_is_null (_tmp16_)) {
+#line 5815 "GalleryConnector.c"
+		gchar* _tmp17_;
 #line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_warning ("GalleryConnector.vala:679: Root node is null, doesn't appear to be JSO" \
 "N data");
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp18_ = g_strdup ("");
+		_tmp17_ = g_strdup ("");
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		result = _tmp18_;
+		result = _tmp17_;
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_object_unref0 (parser);
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5626,20 +5859,20 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 		_g_free0 (json_object);
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return result;
-#line 5598 "GalleryConnector.c"
+#line 5831 "GalleryConnector.c"
 	}
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = root_node;
+	_tmp18_ = root_node;
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = json_node_get_object (_tmp19_);
+	_tmp19_ = json_node_get_object (_tmp18_);
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp21_ = json_object_get_string_member (_tmp20_, "url");
+	_tmp20_ = json_object_get_string_member (_tmp19_, "url");
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp22_ = g_strdup (_tmp21_);
+	_tmp21_ = g_strdup (_tmp20_);
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (new_url);
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	new_url = _tmp22_;
+	new_url = _tmp21_;
 #line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = new_url;
 #line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5648,21 +5881,24 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 	_g_free0 (json_object);
 #line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 5620 "GalleryConnector.c"
+#line 5853 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error) {
+static void
+publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self,
+                                                                        const gchar* tag_url,
+                                                                        GError** error)
+{
 	PublishingGallery3GallerySetTagRelationshipTransaction* tag_txn = NULL;
 	PublishingRESTSupportSession* _tmp0_;
 	PublishingGallery3Session* _tmp1_;
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
-	const gchar* _tmp4_;
+	PublishingGallery3GallerySetTagRelationshipTransaction* _tmp4_;
 	PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_;
-	PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_;
+	gchar* _tmp6_;
 	gchar* _tmp7_;
-	gchar* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self));
@@ -5675,17 +5911,15 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp2_ = self->priv->item_tags_path;
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = tag_url;
+	_tmp3_ = self->priv->item_url;
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = self->priv->item_url;
+	_tmp4_ = publishing_gallery3_gallery_set_tag_relationship_transaction_new (_tmp1_, _tmp2_, tag_url, _tmp3_);
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = publishing_gallery3_gallery_set_tag_relationship_transaction_new (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	tag_txn = _tmp6_;
+	tag_txn = _tmp5_;
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5698,7 +5932,7 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh
 			_publishing_rest_support_transaction_unref0 (tag_txn);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 5670 "GalleryConnector.c"
+#line 5904 "GalleryConnector.c"
 		} else {
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_publishing_rest_support_transaction_unref0 (tag_txn);
@@ -5708,24 +5942,26 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh
 			g_clear_error (&_inner_error_);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 5680 "GalleryConnector.c"
+#line 5914 "GalleryConnector.c"
 		}
 	}
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp6_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("GalleryConnector.vala:699: Response from setting tag relationship: %s", _tmp8_);
+	g_debug ("GalleryConnector.vala:699: Response from setting tag relationship: %s", _tmp7_);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp7_);
 #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (tag_txn);
-#line 5693 "GalleryConnector.c"
+#line 5927 "GalleryConnector.c"
 }
 
 
-static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self) {
+static gchar*
+publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self)
+{
 	gchar* result = NULL;
 	PublishingGallery3GalleryGetItemTagsURLsTransaction* tag_urls_txn = NULL;
 	PublishingRESTSupportSession* _tmp0_;
@@ -5752,7 +5988,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	tag_urls_txn = _tmp4_;
-#line 5724 "GalleryConnector.c"
+#line 5960 "GalleryConnector.c"
 	{
 		PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_;
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5763,7 +5999,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5735 "GalleryConnector.c"
+#line 5971 "GalleryConnector.c"
 				goto __catch6_spit_publishing_publishing_error;
 			}
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5774,7 +6010,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
 			g_clear_error (&_inner_error_);
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 5746 "GalleryConnector.c"
+#line 5982 "GalleryConnector.c"
 		}
 	}
 	goto __finally6;
@@ -5804,7 +6040,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
 		_publishing_rest_support_transaction_unref0 (tag_urls_txn);
 #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return result;
-#line 5776 "GalleryConnector.c"
+#line 6012 "GalleryConnector.c"
 	}
 	__finally6:
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5817,7 +6053,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
 		g_clear_error (&_inner_error_);
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return NULL;
-#line 5789 "GalleryConnector.c"
+#line 6025 "GalleryConnector.c"
 	}
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp9_ = tag_urls_txn;
@@ -5829,20 +6065,22 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
 	_publishing_rest_support_transaction_unref0 (tag_urls_txn);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 5801 "GalleryConnector.c"
+#line 6037 "GalleryConnector.c"
 }
 
 
-static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag) {
+static gchar*
+publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self,
+                                                            const gchar* tag)
+{
 	gchar* result = NULL;
 	PublishingGallery3GalleryGetTagTransaction* tag_txn = NULL;
 	PublishingRESTSupportSession* _tmp0_;
 	PublishingGallery3Session* _tmp1_;
-	const gchar* _tmp2_;
+	PublishingGallery3GalleryGetTagTransaction* _tmp2_;
 	PublishingGallery3GalleryGetTagTransaction* _tmp3_;
-	PublishingGallery3GalleryGetTagTransaction* _tmp4_;
-	PublishingGallery3GalleryGetTagTransaction* _tmp9_;
-	gchar* _tmp10_;
+	PublishingGallery3GalleryGetTagTransaction* _tmp8_;
+	gchar* _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL);
@@ -5853,27 +6091,25 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = tag;
+	_tmp2_ = publishing_gallery3_gallery_get_tag_transaction_new (_tmp1_, tag);
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = publishing_gallery3_gallery_get_tag_transaction_new (_tmp1_, _tmp2_);
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	tag_txn = _tmp4_;
-#line 5834 "GalleryConnector.c"
+	tag_txn = _tmp3_;
+#line 6070 "GalleryConnector.c"
 	{
-		PublishingGallery3GalleryGetTagTransaction* _tmp5_;
+		PublishingGallery3GalleryGetTagTransaction* _tmp4_;
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = tag_txn;
+		_tmp4_ = tag_txn;
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5845 "GalleryConnector.c"
+#line 6081 "GalleryConnector.c"
 				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5884,37 +6120,37 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 			g_clear_error (&_inner_error_);
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return NULL;
-#line 5856 "GalleryConnector.c"
+#line 6092 "GalleryConnector.c"
 		}
 	}
 	goto __finally7;
 	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_;
-		const gchar* _tmp7_;
-		gchar* _tmp8_;
+		GError* _tmp5_;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		err = _inner_error_;
 #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_inner_error_ = NULL;
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = err;
+		_tmp5_ = err;
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = _tmp6_->message;
+		_tmp6_ = _tmp5_->message;
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		g_debug ("GalleryConnector.vala:728: Problem getting the tags URL: %s", _tmp7_);
+		g_debug ("GalleryConnector.vala:728: Problem getting the tags URL: %s", _tmp6_);
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = g_strdup ("");
+		_tmp7_ = g_strdup ("");
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		result = _tmp8_;
+		result = _tmp7_;
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_publishing_rest_support_transaction_unref0 (tag_txn);
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return result;
-#line 5886 "GalleryConnector.c"
+#line 6122 "GalleryConnector.c"
 	}
 	__finally7:
 #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5927,30 +6163,35 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 		g_clear_error (&_inner_error_);
 #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return NULL;
-#line 5899 "GalleryConnector.c"
+#line 6135 "GalleryConnector.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = tag_txn;
+	_tmp8_ = tag_txn;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = publishing_gallery3_gallery_get_tag_transaction_tag_url (_tmp9_);
+	_tmp9_ = publishing_gallery3_gallery_get_tag_transaction_tag_url (_tmp8_);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp10_;
+	result = _tmp9_;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (tag_txn);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 5911 "GalleryConnector.c"
+#line 6147 "GalleryConnector.c"
 }
 
 
-static gpointer _g_error_copy0 (gpointer self) {
+static gpointer
+_g_error_copy0 (gpointer self)
+{
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 5918 "GalleryConnector.c"
+#line 6156 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error) {
+static void
+publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self,
+                                                                    GError** error)
+{
 	PublishingGallery3PublishingParameters* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
@@ -5967,7 +6208,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 	_tmp2_ = _tmp1_;
 #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (!_tmp2_) {
-#line 5939 "GalleryConnector.c"
+#line 6180 "GalleryConnector.c"
 		gchar** keywords = NULL;
 		gint keywords_length1 = 0;
 		gint _keywords_size_ = 0;
@@ -6012,7 +6253,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 5984 "GalleryConnector.c"
+#line 6225 "GalleryConnector.c"
 		}
 #line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp7_ = publishing_gallery3_gallery_upload_transaction_get_new_item_url (self);
@@ -6048,18 +6289,18 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 		if (g_strcmp0 ("", _tmp14_) == 0) {
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp13_ = TRUE;
-#line 6020 "GalleryConnector.c"
+#line 6261 "GalleryConnector.c"
 		} else {
 			const gchar* _tmp15_;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp15_ = self->priv->item_tags_path;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp13_ = g_strcmp0 ("", _tmp15_) == 0;
-#line 6027 "GalleryConnector.c"
+#line 6268 "GalleryConnector.c"
 		}
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (_tmp13_) {
-#line 6031 "GalleryConnector.c"
+#line 6272 "GalleryConnector.c"
 			GError* _tmp16_;
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED, "Could not obtain URL of uploaded item or its " "\"item_tags\" relationship URL");
@@ -6073,7 +6314,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 				keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				return;
-#line 6045 "GalleryConnector.c"
+#line 6286 "GalleryConnector.c"
 			} else {
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
@@ -6083,14 +6324,14 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 				g_clear_error (&_inner_error_);
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				return;
-#line 6055 "GalleryConnector.c"
+#line 6296 "GalleryConnector.c"
 			}
 		}
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp17_ = keywords;
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp17__length1 = keywords_length1;
-#line 6062 "GalleryConnector.c"
+#line 6303 "GalleryConnector.c"
 		{
 			gchar** tag_collection = NULL;
 			gint tag_collection_length1 = 0;
@@ -6102,14 +6343,14 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 			tag_collection_length1 = _tmp17__length1;
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			for (tag_it = 0; tag_it < _tmp17__length1; tag_it = tag_it + 1) {
-#line 6074 "GalleryConnector.c"
+#line 6315 "GalleryConnector.c"
 				gchar* _tmp18_;
 				gchar* tag = NULL;
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp18_ = g_strdup (tag_collection[tag_it]);
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				tag = _tmp18_;
-#line 6081 "GalleryConnector.c"
+#line 6322 "GalleryConnector.c"
 				{
 					const gchar* _tmp19_;
 					const gchar* _tmp20_;
@@ -6136,7 +6377,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 					_tmp24_ = publishing_gallery3_gallery_upload_transaction_get_tag_url (self, _tmp23_);
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					new_tag_url = _tmp24_;
-#line 6108 "GalleryConnector.c"
+#line 6349 "GalleryConnector.c"
 					{
 						const gchar* _tmp25_;
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6147,7 +6388,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 							if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 6119 "GalleryConnector.c"
+#line 6360 "GalleryConnector.c"
 								goto __catch8_spit_publishing_publishing_error;
 							}
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6162,7 +6403,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 							g_clear_error (&_inner_error_);
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 							return;
-#line 6134 "GalleryConnector.c"
+#line 6375 "GalleryConnector.c"
 						}
 					}
 					goto __finally8;
@@ -6191,7 +6432,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 						_inner_error_ = _tmp29_;
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_g_error_free0 (err);
-#line 6163 "GalleryConnector.c"
+#line 6404 "GalleryConnector.c"
 						goto __finally8;
 					}
 					__finally8:
@@ -6209,7 +6450,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 							keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 							return;
-#line 6181 "GalleryConnector.c"
+#line 6422 "GalleryConnector.c"
 						} else {
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 							_g_free0 (new_tag_url);
@@ -6223,25 +6464,28 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
 							g_clear_error (&_inner_error_);
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 							return;
-#line 6195 "GalleryConnector.c"
+#line 6436 "GalleryConnector.c"
 						}
 					}
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_g_free0 (new_tag_url);
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_g_free0 (tag);
-#line 6202 "GalleryConnector.c"
+#line 6443 "GalleryConnector.c"
 				}
 			}
 		}
 #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 6208 "GalleryConnector.c"
+#line 6449 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                             GError** error)
+{
 	PublishingGallery3GalleryUploadTransaction * self;
 	GError * _inner_error_ = NULL;
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6256,7 +6500,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
 			g_propagate_error (error, _inner_error_);
 #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 6228 "GalleryConnector.c"
+#line 6472 "GalleryConnector.c"
 		} else {
 #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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);
@@ -6264,7 +6508,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
 			g_clear_error (&_inner_error_);
 #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 6236 "GalleryConnector.c"
+#line 6480 "GalleryConnector.c"
 		}
 	}
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6277,7 +6521,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
 			g_propagate_error (error, _inner_error_);
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 6249 "GalleryConnector.c"
+#line 6493 "GalleryConnector.c"
 		} else {
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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);
@@ -6285,13 +6529,15 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
 			g_clear_error (&_inner_error_);
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 6257 "GalleryConnector.c"
+#line 6501 "GalleryConnector.c"
 		}
 	}
 }
 
 
-static void publishing_gallery3_gallery_upload_transaction_class_init (PublishingGallery3GalleryUploadTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_upload_transaction_class_init (PublishingGallery3GalleryUploadTransactionClass * klass)
+{
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_upload_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6300,18 +6546,22 @@ static void publishing_gallery3_gallery_upload_transaction_class_init (Publishin
 	g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryUploadTransactionPrivate));
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute;
-#line 6272 "GalleryConnector.c"
+#line 6518 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_upload_transaction_instance_init (PublishingGallery3GalleryUploadTransaction * self) {
+static void
+publishing_gallery3_gallery_upload_transaction_instance_init (PublishingGallery3GalleryUploadTransaction * self)
+{
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 6279 "GalleryConnector.c"
+#line 6527 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingGallery3GalleryUploadTransaction * self;
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransaction);
@@ -6329,11 +6579,13 @@ static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingR
 	_g_free0 (self->priv->item_tags_path);
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_upload_transaction_parent_class)->finalize (obj);
-#line 6301 "GalleryConnector.c"
+#line 6551 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_gallery_upload_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_upload_transaction_get_type (void)
+{
 	static volatile gsize publishing_gallery3_gallery_upload_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_gallery_upload_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryUploadTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_upload_transaction_instance_init, NULL };
@@ -6345,11 +6597,13 @@ GType publishing_gallery3_gallery_upload_transaction_get_type (void) {
 }
 
 
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingGallery3GalleryPublisher*
+publishing_gallery3_gallery_publisher_construct (GType object_type,
+                                                 SpitPublishingService* service,
+                                                 SpitPublishingPluginHost* host)
+{
 	PublishingGallery3GalleryPublisher * self = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingGallery3Session* _tmp2_;
+	PublishingGallery3Session* _tmp0_;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6357,33 +6611,34 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_constr
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3GalleryPublisher*) g_object_new (object_type, NULL);
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = service;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->service = _tmp0_;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = host;
+	self->priv->service = service;
 #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->host = _tmp1_;
+	self->priv->host = host;
 #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = publishing_gallery3_session_new ();
+	_tmp0_ = publishing_gallery3_session_new ();
 #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->session = _tmp2_;
+	self->priv->session = _tmp0_;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 6344 "GalleryConnector.c"
+#line 6594 "GalleryConnector.c"
 }
 
 
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingGallery3GalleryPublisher*
+publishing_gallery3_gallery_publisher_new (SpitPublishingService* service,
+                                           SpitPublishingPluginHost* host)
+{
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_gallery_publisher_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, service, host);
-#line 6351 "GalleryConnector.c"
+#line 6604 "GalleryConnector.c"
 }
 
 
-static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base)
+{
 	PublishingGallery3GalleryPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -6395,11 +6650,13 @@ static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPubli
 	result = _tmp0_;
 #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6367 "GalleryConnector.c"
+#line 6622 "GalleryConnector.c"
 }
 
 
-static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base)
+{
 	PublishingGallery3GalleryPublisher * self;
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
@@ -6414,156 +6671,157 @@ static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_ser
 	result = _tmp1_;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6386 "GalleryConnector.c"
+#line 6643 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base)
+{
 	PublishingGallery3GalleryPublisher * self;
-	gboolean _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	gchar* _tmp2_;
-	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp3_;
 #line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
 #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp0_) {
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 6405 "GalleryConnector.c"
+#line 6661 "GalleryConnector.c"
 	}
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = self->priv->host;
+	_tmp0_ = self->priv->host;
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp1_ == NULL) {
+	if (_tmp0_ == NULL) {
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:834: %s", "GalleryPublisher: start( ): can't start; this " "publisher is not restartable.");
-#line 6413 "GalleryConnector.c"
+#line 6669 "GalleryConnector.c"
 	}
 #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:837: GalleryPublisher: starting interaction.");
 #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->running = TRUE;
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = publishing_gallery3_gallery_publisher_get_api_key (self);
+	_tmp1_ = publishing_gallery3_gallery_publisher_get_api_key (self);
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->key);
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->key = _tmp2_;
+	self->priv->key = _tmp1_;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = self->priv->key;
+	_tmp3_ = self->priv->key;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (NULL == _tmp4_) {
+	if (NULL == _tmp3_) {
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = TRUE;
-#line 6431 "GalleryConnector.c"
+		_tmp2_ = TRUE;
+#line 6687 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp5_;
+		const gchar* _tmp4_;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = self->priv->key;
+		_tmp4_ = self->priv->key;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = g_strcmp0 ("", _tmp5_) == 0;
-#line 6438 "GalleryConnector.c"
+		_tmp2_ = g_strcmp0 ("", _tmp4_) == 0;
+#line 6694 "GalleryConnector.c"
 	}
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 6444 "GalleryConnector.c"
+#line 6700 "GalleryConnector.c"
 	} else {
 		gchar* url = NULL;
-		gchar* _tmp6_;
+		gchar* _tmp5_;
 		gchar* username = NULL;
-		gchar* _tmp7_;
+		gchar* _tmp6_;
+		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
-		const gchar* _tmp10_;
+		const gchar* _tmp9_;
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
+		_tmp5_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		url = _tmp6_;
+		url = _tmp5_;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
+		_tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		username = _tmp7_;
+		username = _tmp6_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = username;
+		_tmp9_ = username;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (NULL == _tmp10_) {
+		if (NULL == _tmp9_) {
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp9_ = TRUE;
-#line 6467 "GalleryConnector.c"
+			_tmp8_ = TRUE;
+#line 6723 "GalleryConnector.c"
 		} else {
-			const gchar* _tmp11_;
+			const gchar* _tmp10_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp11_ = self->priv->key;
+			_tmp10_ = self->priv->key;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp9_ = NULL == _tmp11_;
-#line 6474 "GalleryConnector.c"
+			_tmp8_ = NULL == _tmp10_;
+#line 6730 "GalleryConnector.c"
 		}
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (_tmp9_) {
+		if (_tmp8_) {
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp8_ = TRUE;
-#line 6480 "GalleryConnector.c"
+			_tmp7_ = TRUE;
+#line 6736 "GalleryConnector.c"
 		} else {
-			const gchar* _tmp12_;
+			const gchar* _tmp11_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp12_ = url;
+			_tmp11_ = url;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp8_ = NULL == _tmp12_;
-#line 6487 "GalleryConnector.c"
+			_tmp7_ = NULL == _tmp11_;
+#line 6743 "GalleryConnector.c"
 		}
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (_tmp8_) {
+		if (_tmp7_) {
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 6493 "GalleryConnector.c"
+#line 6749 "GalleryConnector.c"
 		} else {
+			const gchar* _tmp12_;
 			const gchar* _tmp13_;
-			const gchar* _tmp14_;
-			SpitPublishingPluginHost* _tmp15_;
-			PublishingGallery3Session* _tmp16_;
+			SpitPublishingPluginHost* _tmp14_;
+			PublishingGallery3Session* _tmp15_;
+			const gchar* _tmp16_;
 			const gchar* _tmp17_;
 			const gchar* _tmp18_;
-			const gchar* _tmp19_;
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp13_ = username;
+			_tmp12_ = username;
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp14_ = url;
+			_tmp13_ = url;
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			g_debug ("ACTION: attempting network login for user " "'%s' at URL '%s' from saved credentials.", _tmp13_, _tmp14_);
+			g_debug ("ACTION: attempting network login for user " "'%s' at URL '%s' from saved credentials.", _tmp12_, _tmp13_);
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp15_ = self->priv->host;
+			_tmp14_ = self->priv->host;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp15_);
+			spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp14_);
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp16_ = self->priv->session;
+			_tmp15_ = self->priv->session;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp17_ = url;
+			_tmp16_ = url;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp18_ = username;
+			_tmp17_ = username;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp19_ = self->priv->key;
+			_tmp18_ = self->priv->key;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			publishing_gallery3_session_authenticate (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
+			publishing_gallery3_session_authenticate (_tmp15_, _tmp16_, _tmp17_, _tmp18_);
 #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_fetch_album_urls (self);
-#line 6524 "GalleryConnector.c"
+#line 6780 "GalleryConnector.c"
 		}
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (username);
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url);
-#line 6530 "GalleryConnector.c"
+#line 6786 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base)
+{
 	PublishingGallery3GalleryPublisher * self;
 #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
@@ -6571,11 +6829,13 @@ static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPubli
 	g_debug ("GalleryConnector.vala:867: GalleryPublisher: stop( ) invoked.");
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->running = FALSE;
-#line 6543 "GalleryConnector.c"
+#line 6801 "GalleryConnector.c"
 }
 
 
-gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self) {
+gchar*
+publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -6589,13 +6849,15 @@ gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3Gall
 	result = _tmp1_;
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6561 "GalleryConnector.c"
+#line 6821 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key) {
+void
+publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self,
+                                                   const gchar* key)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6603,14 +6865,14 @@ void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3Galler
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->host;
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = key;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "api-key", _tmp1_);
-#line 6578 "GalleryConnector.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "api-key", key);
+#line 6838 "GalleryConnector.c"
 }
 
 
-gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self) {
+gchar*
+publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -6624,13 +6886,15 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3
 	result = _tmp1_;
 #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6596 "GalleryConnector.c"
+#line 6858 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url) {
+void
+publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self,
+                                                       const gchar* url)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6638,14 +6902,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3Ga
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->host;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = url;
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 6613 "GalleryConnector.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", url);
+#line 6875 "GalleryConnector.c"
 }
 
 
-gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self) {
+gchar*
+publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -6659,13 +6923,15 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGal
 	result = _tmp1_;
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6631 "GalleryConnector.c"
+#line 6895 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username) {
+void
+publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self,
+                                                            const gchar* username)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6673,14 +6939,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGalle
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->host;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = username;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 6648 "GalleryConnector.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", username);
+#line 6912 "GalleryConnector.c"
 }
 
 
-static gboolean* _bool_dup (gboolean* self) {
+static gboolean*
+_bool_dup (gboolean* self)
+{
 	gboolean* dup;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	dup = g_new0 (gboolean, 1);
@@ -6688,18 +6954,22 @@ static gboolean* _bool_dup (gboolean* self) {
 	memcpy (dup, self, sizeof (gboolean));
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return dup;
-#line 6660 "GalleryConnector.c"
+#line 6926 "GalleryConnector.c"
 }
 
 
-static gpointer __bool_dup0 (gpointer self) {
+static gpointer
+__bool_dup0 (gpointer self)
+{
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? _bool_dup (self) : NULL;
-#line 6667 "GalleryConnector.c"
+#line 6935 "GalleryConnector.c"
 }
 
 
-gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self) {
+gboolean*
+publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self)
+{
 	gboolean* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gboolean _tmp1_;
@@ -6716,26 +6986,28 @@ gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (P
 	result = _tmp2_;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6688 "GalleryConnector.c"
+#line 6958 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata) {
+void
+publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self,
+                                                                     gboolean strip_metadata)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->host;
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = strip_metadata;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", _tmp1_);
-#line 6703 "GalleryConnector.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", strip_metadata);
+#line 6973 "GalleryConnector.c"
 }
 
 
-static gint* _int_dup (gint* self) {
+static gint*
+_int_dup (gint* self)
+{
 	gint* dup;
 #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	dup = g_new0 (gint, 1);
@@ -6743,18 +7015,22 @@ static gint* _int_dup (gint* self) {
 	memcpy (dup, self, sizeof (gint));
 #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return dup;
-#line 6715 "GalleryConnector.c"
+#line 6987 "GalleryConnector.c"
 }
 
 
-static gpointer __int_dup0 (gpointer self) {
+static gpointer
+__int_dup0 (gpointer self)
+{
 #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? _int_dup (self) : NULL;
-#line 6722 "GalleryConnector.c"
+#line 6996 "GalleryConnector.c"
 }
 
 
-gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self) {
+gint*
+publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self)
+{
 	gint* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gint _tmp1_;
@@ -6771,26 +7047,28 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (Publishin
 	result = _tmp2_;
 #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6743 "GalleryConnector.c"
+#line 7019 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint) {
+void
+publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self,
+                                                                 gint constraint)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->host;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = constraint;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-constraint-id", _tmp1_);
-#line 6758 "GalleryConnector.c"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-constraint-id", constraint);
+#line 7034 "GalleryConnector.c"
 }
 
 
-gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self) {
+gint*
+publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self)
+{
 	gint* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gint _tmp1_;
@@ -6807,33 +7085,37 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGaller
 	result = _tmp2_;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 6779 "GalleryConnector.c"
+#line 7057 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels) {
+void
+publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self,
+                                                          gint pixels)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->host;
 #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = pixels;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-pixels", _tmp1_);
-#line 6794 "GalleryConnector.c"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-pixels", pixels);
+#line 7072 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self)
+{
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_service_welcome_login ((PublishingGallery3GalleryPublisher*) self);
-#line 6801 "GalleryConnector.c"
+#line 7081 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -6843,124 +7125,138 @@ static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (
 	_tmp0_ = self->priv->host;
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_GALLERY3_SERVICE_WELCOME_MESSAGE, _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 6815 "GalleryConnector.c"
+#line 7097 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender,
+                                                                                                            gpointer self)
+{
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_credentials_go_back ((PublishingGallery3GalleryPublisher*) self);
-#line 6822 "GalleryConnector.c"
+#line 7107 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender, const gchar* url, const gchar* uname, const gchar* password, const gchar* key, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender,
+                                                                                                        const gchar* url,
+                                                                                                        const gchar* uname,
+                                                                                                        const gchar* password,
+                                                                                                        const gchar* key,
+                                                                                                        gpointer self)
+{
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_credentials_login ((PublishingGallery3GalleryPublisher*) self, url, uname, password);
-#line 6829 "GalleryConnector.c"
+#line 7121 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode) {
-	PublishingGallery3CredentialsPaneMode _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self,
+                                                                PublishingGallery3CredentialsPaneMode mode)
+{
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	PublishingGallery3Session* _tmp3_;
+	PublishingGallery3Session* _tmp2_;
 	PublishingGallery3CredentialsPane* creds_pane = NULL;
-	SpitPublishingPluginHost* _tmp4_;
-	PublishingGallery3CredentialsPaneMode _tmp5_;
+	SpitPublishingPluginHost* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	gchar* _tmp6_;
 	gchar* _tmp7_;
 	gchar* _tmp8_;
 	gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-	PublishingGallery3CredentialsPane* _tmp12_;
-	PublishingGallery3CredentialsPane* _tmp13_;
-	SpitPublishingPluginHost* _tmp14_;
+	PublishingGallery3CredentialsPane* _tmp10_;
+	PublishingGallery3CredentialsPane* _tmp11_;
+	SpitPublishingPluginHost* _tmp12_;
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = mode;
+	_tmp0_ = publishing_gallery3_credentials_pane_mode_to_string (mode);
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_gallery3_credentials_pane_mode_to_string (_tmp0_);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:933: ACTION: showing credentials capture pane in" \
-" %s mode.", _tmp2_);
+" %s mode.", _tmp1_);
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_session_deauthenticate (_tmp3_);
+	publishing_gallery3_session_deauthenticate (_tmp2_);
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+	_tmp3_ = self->priv->host;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = self->priv->host;
+	_tmp4_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = mode;
+	_tmp5_ = _tmp4_;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
+	_tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = _tmp6_;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
+	_tmp8_ = publishing_gallery3_gallery_publisher_get_api_key (self);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp9_ = _tmp8_;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = publishing_gallery3_gallery_publisher_get_api_key (self);
+	_tmp10_ = publishing_gallery3_credentials_pane_new (_tmp3_, mode, _tmp5_, _tmp7_, _tmp9_);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp11_ = _tmp10_;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = publishing_gallery3_credentials_pane_new (_tmp4_, _tmp5_, _tmp7_, _tmp9_, _tmp11_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = _tmp12_;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp11_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (_tmp9_);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (_tmp7_);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	creds_pane = _tmp13_;
+	_g_free0 (_tmp5_);
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+	creds_pane = _tmp11_;
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (creds_pane, "go-back", (GCallback) _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back, self, 0);
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (creds_pane, "login", (GCallback) _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login, self, 0);
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = self->priv->host;
+	_tmp12_ = self->priv->host;
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (creds_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (creds_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (creds_pane);
-#line 6904 "GalleryConnector.c"
+#line 7193 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                             GError* err,
+                                                                                                             gpointer self)
+{
 #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_key_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 6911 "GalleryConnector.c"
+#line 7204 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                            gpointer self)
+{
 #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_key_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 6918 "GalleryConnector.c"
+#line 7214 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
+static void
+publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self,
+                                                        const gchar* url,
+                                                        const gchar* username,
+                                                        const gchar* password)
+{
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingGallery3KeyFetchTransaction* fetch_trans = NULL;
-	PublishingGallery3Session* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
-	PublishingGallery3KeyFetchTransaction* _tmp7_;
+	PublishingGallery3Session* _tmp1_;
+	PublishingGallery3KeyFetchTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -6971,32 +7267,22 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (password != NULL);
 #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = username;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = url;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("ACTION: attempting network login for user '%s' at URL " "'%s'.", _tmp0_, _tmp1_);
+	g_debug ("ACTION: attempting network login for user '%s' at URL " "'%s'.", username, url);
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = self->priv->host;
+	_tmp0_ = self->priv->host;
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_publishing_plugin_host_install_login_wait_pane (_tmp2_);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = self->priv->session;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = url;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = username;
+	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = password;
+	_tmp1_ = self->priv->session;
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = publishing_gallery3_key_fetch_transaction_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_);
+	_tmp2_ = publishing_gallery3_key_fetch_transaction_new (_tmp1_, url, username, password);
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	fetch_trans = _tmp7_;
+	fetch_trans = _tmp2_;
 #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 6967 "GalleryConnector.c"
+#line 7253 "GalleryConnector.c"
 	{
 #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7004,7 +7290,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 6975 "GalleryConnector.c"
+#line 7261 "GalleryConnector.c"
 				goto __catch9_spit_publishing_publishing_error;
 			}
 #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7015,14 +7301,14 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
 			g_clear_error (&_inner_error_);
 #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 6986 "GalleryConnector.c"
+#line 7272 "GalleryConnector.c"
 		}
 	}
 	goto __finally9;
 	__catch9_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp8_;
+		GError* _tmp3_;
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		err = _inner_error_;
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7030,12 +7316,12 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
 #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_debug ("GalleryConnector.vala:962: Caught an error attempting to login");
 #line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = err;
+		_tmp3_ = err;
 #line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp8_);
+		publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_);
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 7006 "GalleryConnector.c"
+#line 7292 "GalleryConnector.c"
 	}
 	__finally9:
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7048,29 +7334,38 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
 		g_clear_error (&_inner_error_);
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7019 "GalleryConnector.c"
+#line 7305 "GalleryConnector.c"
 	}
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (fetch_trans);
-#line 7023 "GalleryConnector.c"
+#line 7309 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                    GError* err,
+                                                                                                                    gpointer self)
+{
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_album_urls_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7030 "GalleryConnector.c"
+#line 7320 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                   gpointer self)
+{
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 7037 "GalleryConnector.c"
+#line 7330 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingGallery3GetAlbumURLsTransaction* album_trans = NULL;
 	PublishingGallery3Session* _tmp1_;
@@ -7092,7 +7387,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 7063 "GalleryConnector.c"
+#line 7358 "GalleryConnector.c"
 	{
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7100,7 +7395,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7071 "GalleryConnector.c"
+#line 7366 "GalleryConnector.c"
 				goto __catch10_spit_publishing_publishing_error;
 			}
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7111,7 +7406,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
 			g_clear_error (&_inner_error_);
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 7082 "GalleryConnector.c"
+#line 7377 "GalleryConnector.c"
 		}
 	}
 	goto __finally10;
@@ -7131,7 +7426,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
 		publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_);
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 7102 "GalleryConnector.c"
+#line 7397 "GalleryConnector.c"
 	}
 	__finally10:
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7144,55 +7439,58 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
 		g_clear_error (&_inner_error_);
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7115 "GalleryConnector.c"
+#line 7410 "GalleryConnector.c"
 	}
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7119 "GalleryConnector.c"
+#line 7414 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                               GError* err,
+                                                                                                               gpointer self)
+{
 #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_album_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7126 "GalleryConnector.c"
+#line 7425 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                              gpointer self)
+{
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_album_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 7133 "GalleryConnector.c"
+#line 7435 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start) {
+static void
+publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self,
+                                                       gchar** album_urls,
+                                                       int album_urls_length1,
+                                                       guint start)
+{
 	PublishingGallery3GetAlbumsTransaction* album_trans = NULL;
 	PublishingGallery3Session* _tmp0_;
-	gchar** _tmp1_;
-	gint _tmp1__length1;
-	guint _tmp2_;
-	PublishingGallery3GetAlbumsTransaction* _tmp3_;
+	PublishingGallery3GetAlbumsTransaction* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->session;
 #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = album_urls;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1__length1 = album_urls_length1;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = start;
+	_tmp1_ = publishing_gallery3_get_albums_transaction_new (_tmp0_, album_urls, album_urls_length1, start);
 #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = publishing_gallery3_get_albums_transaction_new (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	album_trans = _tmp3_;
+	album_trans = _tmp1_;
 #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 7163 "GalleryConnector.c"
+#line 7461 "GalleryConnector.c"
 	{
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7200,7 +7498,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7171 "GalleryConnector.c"
+#line 7469 "GalleryConnector.c"
 				goto __catch11_spit_publishing_publishing_error;
 			}
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7211,25 +7509,25 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
 			g_clear_error (&_inner_error_);
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 7182 "GalleryConnector.c"
+#line 7480 "GalleryConnector.c"
 		}
 	}
 	goto __finally11;
 	__catch11_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_;
+		GError* _tmp2_;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		err = _inner_error_;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_inner_error_ = NULL;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = err;
+		_tmp2_ = err;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp4_);
+		publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp2_);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 7200 "GalleryConnector.c"
+#line 7498 "GalleryConnector.c"
 	}
 	__finally11:
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7242,48 +7540,57 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
 		g_clear_error (&_inner_error_);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7213 "GalleryConnector.c"
+#line 7511 "GalleryConnector.c"
 	}
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7217 "GalleryConnector.c"
+#line 7515 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, PublishingGallery3PublishingParameters* parameters, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender,
+                                                                                                                               PublishingGallery3PublishingParameters* parameters,
+                                                                                                                               gpointer self)
+{
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish ((PublishingGallery3GalleryPublisher*) self, parameters);
-#line 7224 "GalleryConnector.c"
+#line 7526 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender,
+                                                                                                                             gpointer self)
+{
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout ((PublishingGallery3GalleryPublisher*) self);
-#line 7231 "GalleryConnector.c"
+#line 7536 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username) {
+static void
+publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self,
+                                                                       const gchar* url,
+                                                                       const gchar* username)
+{
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_;
 	SpitPublishingPluginHost* _tmp9_;
-	const gchar* _tmp10_;
-	const gchar* _tmp11_;
-	PublishingGallery3Album** _tmp12_;
-	gint _tmp12__length1;
-	GtkBuilder* _tmp13_;
-	gboolean* _tmp14_;
-	gboolean* _tmp15_;
+	PublishingGallery3Album** _tmp10_;
+	gint _tmp10__length1;
+	GtkBuilder* _tmp11_;
+	gboolean* _tmp12_;
+	gboolean* _tmp13_;
+	gint* _tmp14_;
+	gint* _tmp15_;
 	gint* _tmp16_;
 	gint* _tmp17_;
-	gint* _tmp18_;
-	gint* _tmp19_;
+	PublishingGallery3PublishingOptionsPane* _tmp18_;
+	PublishingGallery3PublishingOptionsPane* _tmp19_;
 	PublishingGallery3PublishingOptionsPane* _tmp20_;
-	PublishingGallery3PublishingOptionsPane* _tmp21_;
+	SpitPublishingPluginHost* _tmp21_;
 	PublishingGallery3PublishingOptionsPane* _tmp22_;
-	SpitPublishingPluginHost* _tmp23_;
-	PublishingGallery3PublishingOptionsPane* _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -7297,7 +7604,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
 	_tmp0_ = gtk_builder_new ();
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	builder = _tmp0_;
-#line 7268 "GalleryConnector.c"
+#line 7575 "GalleryConnector.c"
 	{
 		GtkBuilder* _tmp1_;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7306,7 +7613,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_publishing_options_pane.ui", &_inner_error_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7277 "GalleryConnector.c"
+#line 7584 "GalleryConnector.c"
 			goto __catch12_g_error;
 		}
 	}
@@ -7354,7 +7661,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
 		_g_object_unref0 (builder);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7324 "GalleryConnector.c"
+#line 7631 "GalleryConnector.c"
 	}
 	__finally12:
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7367,83 +7674,88 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
 		g_clear_error (&_inner_error_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7337 "GalleryConnector.c"
+#line 7644 "GalleryConnector.c"
 	}
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp9_ = self->priv->host;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = url;
+	_tmp10_ = self->priv->albums;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = username;
+	_tmp10__length1 = self->priv->albums_length1;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = self->priv->albums;
+	_tmp11_ = builder;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12__length1 = self->priv->albums_length1;
+	_tmp12_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = builder;
+	_tmp13_ = _tmp12_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self);
+	_tmp14_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp15_ = _tmp14_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self);
+	_tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp17_ = _tmp16_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self);
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = _tmp18_;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_, *_tmp15_, *_tmp17_, *_tmp19_);
+	_tmp18_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, url, username, _tmp10_, _tmp10__length1, _tmp11_, *_tmp13_, *_tmp15_, *_tmp17_);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->publishing_options_pane = _tmp20_;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp19_);
+	self->priv->publishing_options_pane = _tmp18_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (_tmp17_);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (_tmp15_);
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+	_g_free0 (_tmp13_);
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp21_ = self->priv->publishing_options_pane;
+	_tmp19_ = self->priv->publishing_options_pane;
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp21_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp19_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0);
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp22_ = self->priv->publishing_options_pane;
+	_tmp20_ = self->priv->publishing_options_pane;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp22_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp20_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0);
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23_ = self->priv->host;
+	_tmp21_ = self->priv->host;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp24_ = self->priv->publishing_options_pane;
+	_tmp22_ = self->priv->publishing_options_pane;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (builder);
-#line 7391 "GalleryConnector.c"
+#line 7694 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                GError* err,
+                                                                                                                gpointer self)
+{
 #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_album_create_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7398 "GalleryConnector.c"
+#line 7705 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                               gpointer self)
+{
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_album_create_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 7405 "GalleryConnector.c"
+#line 7715 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
+static void
+publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self,
+                                                       PublishingGallery3PublishingParameters* parameters)
+{
 	PublishingGallery3GalleryAlbumCreateTransaction* album_trans = NULL;
 	PublishingGallery3Session* _tmp0_;
-	PublishingGallery3PublishingParameters* _tmp1_;
-	PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_;
+	PublishingGallery3GalleryAlbumCreateTransaction* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -7454,16 +7766,14 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->session;
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = parameters;
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = publishing_gallery3_gallery_album_create_transaction_new (_tmp0_, _tmp1_);
+	_tmp1_ = publishing_gallery3_gallery_album_create_transaction_new (_tmp0_, parameters);
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	album_trans = _tmp2_;
+	album_trans = _tmp1_;
 #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 7433 "GalleryConnector.c"
+#line 7743 "GalleryConnector.c"
 	{
 #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7471,7 +7781,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7441 "GalleryConnector.c"
+#line 7751 "GalleryConnector.c"
 				goto __catch13_spit_publishing_publishing_error;
 			}
 #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7482,25 +7792,25 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
 			g_clear_error (&_inner_error_);
 #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 7452 "GalleryConnector.c"
+#line 7762 "GalleryConnector.c"
 		}
 	}
 	goto __finally13;
 	__catch13_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_;
+		GError* _tmp2_;
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		err = _inner_error_;
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_inner_error_ = NULL;
 #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = err;
+		_tmp2_ = err;
 #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_);
+		publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp2_);
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 7470 "GalleryConnector.c"
+#line 7780 "GalleryConnector.c"
 	}
 	__finally13:
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7513,71 +7823,79 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
 		g_clear_error (&_inner_error_);
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7483 "GalleryConnector.c"
+#line 7793 "GalleryConnector.c"
 	}
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7487 "GalleryConnector.c"
+#line 7797 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                   gint num_photos_published,
+                                                                                                                   gpointer self)
+{
 #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_publish_complete ((PublishingGallery3GalleryPublisher*) self, _sender, num_photos_published);
-#line 7494 "GalleryConnector.c"
+#line 7808 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                             GError* err,
+                                                                                                             gpointer self)
+{
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_publish_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7501 "GalleryConnector.c"
+#line 7819 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                   gdouble fraction_complete,
+                                                                                                   gpointer self)
+{
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_on_upload_status_updated ((PublishingGallery3GalleryPublisher*) self, file_number, fraction_complete);
-#line 7508 "GalleryConnector.c"
+#line 7830 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
-	PublishingGallery3PublishingParameters* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self,
+                                                  PublishingGallery3PublishingParameters* parameters)
+{
+	gboolean _tmp0_;
 	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_ = 0;
-	PublishingGallery3PublishingParameters* _tmp4_;
+	gint _tmp2_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint _tmp5_;
 	gint _tmp6_;
-	PublishingGallery3PublishingParameters* _tmp7_;
-	gint _tmp8_;
+	SpitPublishingPluginHost* _tmp7_;
+	SpitPublishingPluginHost* _tmp8_;
 	gint _tmp9_;
-	SpitPublishingPluginHost* _tmp10_;
-	SpitPublishingPluginHost* _tmp11_;
-	PublishingGallery3PublishingParameters* _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	PublishingGallery3PublishingParameters* _tmp15_;
-	gboolean _tmp16_;
-	gboolean _tmp17_;
-	void* _tmp18_;
-	GDestroyNotify _tmp19_;
-	SpitPublishingProgressCallback _tmp20_;
-	gboolean _tmp21_;
+	gint _tmp10_;
+	gboolean _tmp11_;
+	gboolean _tmp12_;
+	void* _tmp13_;
+	GDestroyNotify _tmp14_;
+	SpitPublishingProgressCallback _tmp15_;
 	PublishingGallery3Uploader* uploader = NULL;
-	PublishingGallery3Session* _tmp22_;
-	SpitPublishingPluginHost* _tmp23_;
-	gint _tmp24_;
-	SpitPublishingPublishable** _tmp25_;
-	SpitPublishingPublishable** _tmp26_;
-	gint _tmp26__length1;
-	PublishingGallery3PublishingParameters* _tmp27_;
-	PublishingGallery3Uploader* _tmp28_;
-	PublishingGallery3Uploader* _tmp29_;
-	PublishingGallery3Uploader* _tmp30_;
-	PublishingGallery3Uploader* _tmp31_;
-	PublishingGallery3Uploader* _tmp32_;
+	PublishingGallery3Session* _tmp16_;
+	SpitPublishingPluginHost* _tmp17_;
+	gint _tmp18_;
+	SpitPublishingPublishable** _tmp19_;
+	SpitPublishingPublishable** _tmp20_;
+	gint _tmp20__length1;
+	PublishingGallery3Uploader* _tmp21_;
+	PublishingGallery3Uploader* _tmp22_;
+	PublishingGallery3Uploader* _tmp23_;
+	PublishingGallery3Uploader* _tmp24_;
+	PublishingGallery3Uploader* _tmp25_;
 #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7585,59 +7903,49 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1061: ACTION: publishing items");
 #line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = parameters;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_gallery3_publishing_parameters_get_strip_metadata (_tmp0_);
+	_tmp0_ = publishing_gallery3_publishing_parameters_get_strip_metadata (parameters);
 #line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (self, _tmp2_);
+	publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (self, _tmp1_);
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = parameters;
+	_tmp3_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters);
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp4_);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = _tmp3_;
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp6_ <= 0) {
+	if (_tmp4_ <= 0) {
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = 0;
-#line 7572 "GalleryConnector.c"
+		_tmp2_ = 0;
+#line 7886 "GalleryConnector.c"
 	} else {
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = 1;
-#line 7576 "GalleryConnector.c"
+		_tmp2_ = 1;
+#line 7890 "GalleryConnector.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp3_);
+	publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp2_);
 #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = parameters;
+	_tmp5_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters);
 #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp7_);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = _tmp5_;
 #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_gallery_publisher_set_scaling_pixels (self, _tmp9_);
+	publishing_gallery3_gallery_publisher_set_scaling_pixels (self, _tmp6_);
 #line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = self->priv->host;
+	_tmp7_ = self->priv->host;
 #line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp10_, TRUE);
+	spit_publishing_plugin_host_set_service_locked (_tmp7_, TRUE);
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = self->priv->host;
+	_tmp8_ = self->priv->host;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = parameters;
+	_tmp9_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters);
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp12_);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = _tmp13_;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = parameters;
+	_tmp10_ = _tmp9_;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = publishing_gallery3_publishing_parameters_get_strip_metadata (_tmp15_);
+	_tmp11_ = publishing_gallery3_publishing_parameters_get_strip_metadata (parameters);
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = _tmp16_;
+	_tmp12_ = _tmp11_;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = spit_publishing_plugin_host_serialize_publishables (_tmp11_, _tmp14_, _tmp17_, &_tmp18_, &_tmp19_);
+	_tmp15_ = spit_publishing_plugin_host_serialize_publishables (_tmp8_, _tmp10_, _tmp12_, &_tmp13_, &_tmp14_);
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7647,58 +7955,56 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->progress_reporter = _tmp20_;
+	self->priv->progress_reporter = _tmp15_;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->progress_reporter_target = _tmp18_;
+	self->priv->progress_reporter_target = _tmp13_;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp19_;
+	self->priv->progress_reporter_target_destroy_notify = _tmp14_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp21_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp21_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7628 "GalleryConnector.c"
+#line 7934 "GalleryConnector.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp22_ = self->priv->session;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23_ = self->priv->host;
+	_tmp16_ = self->priv->session;
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp25_ = spit_publishing_plugin_host_get_publishables (_tmp23_, &_tmp24_);
+	_tmp17_ = self->priv->host;
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp26_ = _tmp25_;
+	_tmp19_ = spit_publishing_plugin_host_get_publishables (_tmp17_, &_tmp18_);
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp26__length1 = _tmp24_;
+	_tmp20_ = _tmp19_;
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp27_ = parameters;
+	_tmp20__length1 = _tmp18_;
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp28_ = publishing_gallery3_uploader_new (_tmp22_, _tmp26_, _tmp24_, _tmp27_);
+	_tmp21_ = publishing_gallery3_uploader_new (_tmp16_, _tmp20_, _tmp18_, parameters);
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp29_ = _tmp28_;
+	_tmp22_ = _tmp21_;
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp26_ = (_vala_array_free (_tmp26_, _tmp26__length1, (GDestroyNotify) g_object_unref), NULL);
+	_tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_object_unref), NULL);
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	uploader = _tmp29_;
+	uploader = _tmp22_;
 #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp30_ = uploader;
+	_tmp23_ = uploader;
 #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp31_ = uploader;
+	_tmp24_ = uploader;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp32_ = uploader;
+	_tmp25_ = uploader;
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
 #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 7664 "GalleryConnector.c"
+#line 7968 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7713,39 +8019,36 @@ static void publishing_gallery3_gallery_publisher_do_show_success_pane (Publishi
 	_tmp1_ = self->priv->host;
 #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 7683 "GalleryConnector.c"
+#line 7989 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self)
+{
 #line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7697 "GalleryConnector.c"
+#line 8002 "GalleryConnector.c"
 	}
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1101: EVENT: user clicked 'Login' in welcome pan" \
 "e.");
 #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO);
-#line 7703 "GalleryConnector.c"
+#line 8008 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) {
-	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
+static void
+publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self,
+                                                            const gchar* url,
+                                                            const gchar* username,
+                                                            const gchar* password)
+{
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7755,619 +8058,501 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (password != NULL);
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7729 "GalleryConnector.c"
+#line 8030 "GalleryConnector.c"
 	}
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = username;
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1111: EVENT: user '%s' clicked 'Login' in creden" \
-"tials pane.", _tmp1_);
+"tials pane.", username);
 #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = url;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_gallery_publisher_set_gallery_url (self, _tmp2_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = username;
+	publishing_gallery3_gallery_publisher_set_gallery_url (self, url);
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_gallery_publisher_set_gallery_username (self, _tmp3_);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = url;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = username;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = password;
+	publishing_gallery3_gallery_publisher_set_gallery_username (self, username);
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_gallery_publisher_do_network_login (self, _tmp4_, _tmp5_, _tmp6_);
-#line 7751 "GalleryConnector.c"
+	publishing_gallery3_gallery_publisher_do_network_login (self, url, username, password);
+#line 8040 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self)
+{
 #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7765 "GalleryConnector.c"
+#line 8053 "GalleryConnector.c"
 	}
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1123: EVENT: user is attempting to go back.");
 #line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 7771 "GalleryConnector.c"
+#line 8059 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self,
+                                                          PublishingRESTSupportTransaction* bad_txn,
+                                                          GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PublishingRESTSupportTransaction* _tmp10_;
-	guint _tmp11_;
+	PublishingGallery3Session* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = bad_txn;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_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_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7810 "GalleryConnector.c"
+#line 8089 "GalleryConnector.c"
 	}
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp6_) {
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7820 "GalleryConnector.c"
+#line 8097 "GalleryConnector.c"
 	}
 #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = bad_txn;
+	_tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
 #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("EVENT: network transaction to fetch key for login " "failed; response = '%s'.", _tmp9_);
+	g_debug ("EVENT: network transaction to fetch key for login " "failed; response = '%s'.", _tmp4_);
 #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp9_);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = bad_txn;
+	_g_free0 (_tmp4_);
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp11_ == ((guint) 403)) {
+	if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
 #line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 7840 "GalleryConnector.c"
+#line 8111 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_;
-		guint _tmp13_;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = bad_txn;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
 #line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (_tmp13_ == ((guint) 400)) {
+		if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
 #line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 7852 "GalleryConnector.c"
+#line 8117 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_;
-			GError* _tmp15_;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp14_ = self->priv->host;
+			SpitPublishingPluginHost* _tmp5_;
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp15_ = err;
+			_tmp5_ = self->priv->host;
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 7862 "GalleryConnector.c"
+			spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8124 "GalleryConnector.c"
 		}
 	}
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self,
+                                                             PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gchar* _tmp8_;
-	const gchar* _tmp9_;
+	PublishingGallery3Session* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
 #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7901 "GalleryConnector.c"
+#line 8155 "GalleryConnector.c"
 	}
 #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp6_) {
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7911 "GalleryConnector.c"
+#line 8163 "GalleryConnector.c"
 	}
 #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = txn;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_gallery3_key_fetch_transaction_get_key (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION) ? ((PublishingGallery3KeyFetchTransaction*) _tmp7_) : NULL);
+	_tmp3_ = publishing_gallery3_key_fetch_transaction_get_key (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION) ? ((PublishingGallery3KeyFetchTransaction*) txn) : NULL);
 #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->key);
 #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->key = _tmp8_;
+	self->priv->key = _tmp3_;
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = self->priv->key;
+	_tmp4_ = self->priv->key;
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp9_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:1178: key doesn\'t exist");
-#line 7927 "GalleryConnector.c"
+#line 8177 "GalleryConnector.c"
 	} else {
 		gchar* url = NULL;
-		gchar* _tmp10_;
+		gchar* _tmp5_;
 		gchar* username = NULL;
-		gchar* _tmp11_;
-		const gchar* _tmp12_;
-		PublishingGallery3Session* _tmp13_;
-		const gchar* _tmp14_;
-		const gchar* _tmp15_;
-		const gchar* _tmp16_;
+		gchar* _tmp6_;
+		const gchar* _tmp7_;
+		PublishingGallery3Session* _tmp8_;
+		const gchar* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
 #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
+		_tmp5_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
 #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		url = _tmp10_;
+		url = _tmp5_;
 #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
+		_tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
 #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		username = _tmp11_;
+		username = _tmp6_;
 #line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_debug ("GalleryConnector.vala:1183: %s", "EVENT: network transaction to fetch key completed " "successfully.");
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = self->priv->key;
+		_tmp7_ = self->priv->key;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_set_api_key (self, _tmp12_);
+		publishing_gallery3_gallery_publisher_set_api_key (self, _tmp7_);
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = self->priv->session;
+		_tmp8_ = self->priv->session;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp14_ = url;
+		_tmp9_ = url;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp15_ = username;
+		_tmp10_ = username;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp16_ = self->priv->key;
+		_tmp11_ = self->priv->key;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_session_authenticate (_tmp13_, _tmp14_, _tmp15_, _tmp16_);
+		publishing_gallery3_session_authenticate (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
 #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_fetch_album_urls (self);
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (username);
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url);
-#line 7968 "GalleryConnector.c"
+#line 8218 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self,
+                                                                 PublishingRESTSupportTransaction* bad_txn,
+                                                                 GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PublishingRESTSupportTransaction* _tmp10_;
-	guint _tmp11_;
+	PublishingGallery3Session* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
 #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = bad_txn;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_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_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8008 "GalleryConnector.c"
+#line 8249 "GalleryConnector.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp6_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8018 "GalleryConnector.c"
+#line 8257 "GalleryConnector.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = bad_txn;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+	_tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
 #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("EVENT: network transaction to fetch album URLs " "failed; response = \'%s\'.", _tmp9_);
+	g_debug ("EVENT: network transaction to fetch album URLs " "failed; response = \'%s\'.", _tmp4_);
 #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp9_);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = bad_txn;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
+	_g_free0 (_tmp4_);
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp11_ == ((guint) 403)) {
+	if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
 #line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 8038 "GalleryConnector.c"
+#line 8271 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_;
-		guint _tmp13_;
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = bad_txn;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (_tmp13_ == ((guint) 400)) {
+		if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 8050 "GalleryConnector.c"
+#line 8277 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_;
-			GError* _tmp15_;
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp14_ = self->priv->host;
+			SpitPublishingPluginHost* _tmp5_;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp15_ = err;
+			_tmp5_ = self->priv->host;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8060 "GalleryConnector.c"
+			spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8284 "GalleryConnector.c"
 		}
 	}
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self,
+                                                                    PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
+	PublishingGallery3Session* _tmp2_;
 	gchar** album_urls = NULL;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gint _tmp8_;
-	gchar** _tmp9_;
+	gint _tmp3_;
+	gchar** _tmp4_;
 	gint album_urls_length1;
 	gint _album_urls_size_;
-	gchar** _tmp10_;
-	gint _tmp10__length1;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
 #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8104 "GalleryConnector.c"
+#line 8320 "GalleryConnector.c"
 	}
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp6_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8114 "GalleryConnector.c"
+#line 8328 "GalleryConnector.c"
 	}
 #line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1242: EVENT: retrieving all album URLs.");
 #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = txn;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION) ? ((PublishingGallery3GetAlbumURLsTransaction*) _tmp7_) : NULL, &_tmp8_);
+	_tmp4_ = publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION) ? ((PublishingGallery3GetAlbumURLsTransaction*) txn) : NULL, &_tmp3_);
 #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	album_urls = _tmp9_;
+	album_urls = _tmp4_;
 #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	album_urls_length1 = _tmp8_;
+	album_urls_length1 = _tmp3_;
 #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_album_urls_size_ = album_urls_length1;
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = album_urls;
+	_tmp5_ = album_urls;
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10__length1 = album_urls_length1;
+	_tmp5__length1 = album_urls_length1;
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (NULL == _tmp10_) {
-#line 8134 "GalleryConnector.c"
+	if (NULL == _tmp5_) {
+#line 8346 "GalleryConnector.c"
 		gchar* url = NULL;
-		PublishingGallery3Session* _tmp11_;
-		const gchar* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
+		PublishingGallery3Session* _tmp6_;
+		const gchar* _tmp7_;
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
 		gchar* username = NULL;
-		PublishingGallery3Session* _tmp15_;
-		const gchar* _tmp16_;
-		const gchar* _tmp17_;
-		gchar* _tmp18_;
-		const gchar* _tmp19_;
-		const gchar* _tmp20_;
+		PublishingGallery3Session* _tmp10_;
+		const gchar* _tmp11_;
+		const gchar* _tmp12_;
+		gchar* _tmp13_;
+		const gchar* _tmp14_;
+		const gchar* _tmp15_;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = self->priv->session;
+		_tmp6_ = self->priv->session;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = publishing_gallery3_session_get_url (_tmp11_);
+		_tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = _tmp12_;
+		_tmp8_ = _tmp7_;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp14_ = g_strdup (_tmp13_);
+		_tmp9_ = g_strdup (_tmp8_);
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		url = _tmp14_;
+		url = _tmp9_;
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp15_ = self->priv->session;
+		_tmp10_ = self->priv->session;
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp16_ = publishing_gallery3_session_get_username (_tmp15_);
+		_tmp11_ = publishing_gallery3_session_get_username (_tmp10_);
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp17_ = _tmp16_;
+		_tmp12_ = _tmp11_;
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp18_ = g_strdup (_tmp17_);
+		_tmp13_ = g_strdup (_tmp12_);
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		username = _tmp18_;
+		username = _tmp13_;
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp19_ = url;
+		_tmp14_ = url;
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp20_ = username;
+		_tmp15_ = username;
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp19_, _tmp20_);
+		publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp14_, _tmp15_);
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (username);
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url);
-#line 8177 "GalleryConnector.c"
+#line 8389 "GalleryConnector.c"
 	} else {
-		gchar** _tmp21_;
-		gint _tmp21__length1;
+		gchar** _tmp16_;
+		gint _tmp16__length1;
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp21_ = album_urls;
+		_tmp16_ = album_urls;
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp21__length1 = album_urls_length1;
+		_tmp16__length1 = album_urls_length1;
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp21_, _tmp21__length1, (guint) 0);
-#line 8187 "GalleryConnector.c"
+		publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp16_, _tmp16__length1, (guint) 0);
+#line 8399 "GalleryConnector.c"
 	}
 #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	album_urls = (_vala_array_free (album_urls, album_urls_length1, (GDestroyNotify) g_free), NULL);
-#line 8191 "GalleryConnector.c"
+#line 8403 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self,
+                                                            PublishingRESTSupportTransaction* bad_txn,
+                                                            GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PublishingRESTSupportTransaction* _tmp10_;
-	guint _tmp11_;
+	PublishingGallery3Session* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = bad_txn;
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_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_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8230 "GalleryConnector.c"
+#line 8433 "GalleryConnector.c"
 	}
 #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp6_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8240 "GalleryConnector.c"
+#line 8441 "GalleryConnector.c"
 	}
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = bad_txn;
+	_tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("EVENT: network transaction to fetch albums " "failed; response = \'%s\'.", _tmp9_);
+	g_debug ("EVENT: network transaction to fetch albums " "failed; response = \'%s\'.", _tmp4_);
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp9_);
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = bad_txn;
+	_g_free0 (_tmp4_);
 #line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp11_ == ((guint) 403)) {
+	if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 8260 "GalleryConnector.c"
+#line 8455 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_;
-		guint _tmp13_;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = bad_txn;
 #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (_tmp13_ == ((guint) 400)) {
+		if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
 #line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 8272 "GalleryConnector.c"
+#line 8461 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_;
-			GError* _tmp15_;
+			SpitPublishingPluginHost* _tmp5_;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp14_ = self->priv->host;
+			_tmp5_ = self->priv->host;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp15_ = err;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8282 "GalleryConnector.c"
+			spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8468 "GalleryConnector.c"
 		}
 	}
 }
 
 
-static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) {
+static void
+_vala_array_add5 (PublishingGallery3Album** * array,
+                  int* length,
+                  int* size,
+                  PublishingGallery3Album* value)
+{
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if ((*length) == (*size)) {
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*array = g_renew (PublishingGallery3Album*, *array, (*size) + 1);
-#line 8295 "GalleryConnector.c"
+#line 8486 "GalleryConnector.c"
 	}
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[(*length)++] = value;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	(*array)[*length] = NULL;
-#line 8301 "GalleryConnector.c"
+#line 8492 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self,
+                                                               PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
 	PublishingGallery3Album** new_albums = NULL;
 	gint new_albums_length1;
 	gint _new_albums_size_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
-	PublishingRESTSupportTransaction* _tmp23_;
-	gboolean _tmp24_;
-	gboolean _tmp25_;
+	PublishingGallery3Session* _tmp2_;
+	gboolean _tmp17_;
+	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	new_albums = NULL;
 #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8375,55 +8560,48 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_new_albums_size_ = new_albums_length1;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8350 "GalleryConnector.c"
+#line 8533 "GalleryConnector.c"
 	}
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp6_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
 #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8362 "GalleryConnector.c"
+#line 8543 "GalleryConnector.c"
 	}
 #line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1309: EVENT: user is attempting to populate the " \
 "album list.");
-#line 8366 "GalleryConnector.c"
+#line 8547 "GalleryConnector.c"
 	{
-		PublishingGallery3Album** _tmp7_ = NULL;
-		PublishingRESTSupportTransaction* _tmp8_;
-		gint _tmp9_;
-		PublishingGallery3Album** _tmp10_;
-		gint _tmp7__length1;
-		gint __tmp7__size_;
-		PublishingGallery3Album** _tmp11_;
-		gint _tmp11__length1;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = txn;
+		PublishingGallery3Album** _tmp3_ = NULL;
+		gint _tmp4_;
+		PublishingGallery3Album** _tmp5_;
+		gint _tmp3__length1;
+		gint __tmp3__size_;
+		PublishingGallery3Album** _tmp6_;
+		gint _tmp6__length1;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = publishing_gallery3_get_albums_transaction_get_albums (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp8_) : NULL, &_tmp9_, &_inner_error_);
+		_tmp5_ = publishing_gallery3_get_albums_transaction_get_albums (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL, &_tmp4_, &_inner_error_);
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = _tmp10_;
+		_tmp3_ = _tmp5_;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7__length1 = _tmp9_;
+		_tmp3__length1 = _tmp4_;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		__tmp7__size_ = _tmp7__length1;
+		__tmp3__size_ = _tmp3__length1;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 8390 "GalleryConnector.c"
+#line 8568 "GalleryConnector.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8434,47 +8612,44 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 			g_clear_error (&_inner_error_);
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return;
-#line 8401 "GalleryConnector.c"
+#line 8579 "GalleryConnector.c"
 		}
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = _tmp7_;
+		_tmp6_ = _tmp3_;
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11__length1 = _tmp7__length1;
+		_tmp6__length1 = _tmp3__length1;
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = NULL;
+		_tmp3_ = NULL;
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7__length1 = 0;
+		_tmp3__length1 = 0;
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		new_albums = _tmp11_;
+		new_albums = _tmp6_;
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		new_albums_length1 = _tmp11__length1;
+		new_albums_length1 = _tmp6__length1;
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_new_albums_size_ = new_albums_length1;
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = (_vala_array_free (_tmp7_, _tmp7__length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
-#line 8421 "GalleryConnector.c"
+		_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
+#line 8599 "GalleryConnector.c"
 	}
 	goto __finally14;
 	__catch14_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		PublishingRESTSupportTransaction* _tmp12_;
-		GError* _tmp13_;
+		GError* _tmp7_;
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		err = _inner_error_;
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_inner_error_ = NULL;
 #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = txn;
+		_tmp7_ = err;
 #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = err;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_on_album_fetch_error (self, _tmp12_, _tmp13_);
+		publishing_gallery3_gallery_publisher_on_album_fetch_error (self, txn, _tmp7_);
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 8441 "GalleryConnector.c"
+#line 8616 "GalleryConnector.c"
 	}
 	__finally14:
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8487,626 +8662,553 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		g_clear_error (&_inner_error_);
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8454 "GalleryConnector.c"
+#line 8629 "GalleryConnector.c"
 	}
 	{
 		gint i = 0;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = 0;
-#line 8460 "GalleryConnector.c"
+#line 8635 "GalleryConnector.c"
 		{
-			gboolean _tmp14_ = FALSE;
+			gboolean _tmp8_ = FALSE;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp14_ = TRUE;
+			_tmp8_ = TRUE;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			while (TRUE) {
-#line 8467 "GalleryConnector.c"
-				gint _tmp16_;
-				PublishingGallery3Album** _tmp17_;
-				gint _tmp17__length1;
-				PublishingGallery3Album** _tmp18_;
-				gint _tmp18__length1;
-				PublishingGallery3Album** _tmp19_;
-				gint _tmp19__length1;
-				gint _tmp20_;
-				PublishingGallery3Album* _tmp21_;
-				PublishingGallery3Album* _tmp22_;
+#line 8642 "GalleryConnector.c"
+				gint _tmp10_;
+				PublishingGallery3Album** _tmp11_;
+				gint _tmp11__length1;
+				PublishingGallery3Album** _tmp12_;
+				gint _tmp12__length1;
+				PublishingGallery3Album** _tmp13_;
+				gint _tmp13__length1;
+				gint _tmp14_;
+				PublishingGallery3Album* _tmp15_;
+				PublishingGallery3Album* _tmp16_;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				if (!_tmp14_) {
-#line 8480 "GalleryConnector.c"
-					gint _tmp15_;
+				if (!_tmp8_) {
+#line 8655 "GalleryConnector.c"
+					gint _tmp9_;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					_tmp15_ = i;
+					_tmp9_ = i;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-					i = _tmp15_ + 1;
-#line 8486 "GalleryConnector.c"
+					i = _tmp9_ + 1;
+#line 8661 "GalleryConnector.c"
 				}
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp14_ = FALSE;
+				_tmp8_ = FALSE;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp16_ = i;
+				_tmp10_ = i;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp17_ = new_albums;
+				_tmp11_ = new_albums;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp17__length1 = new_albums_length1;
+				_tmp11__length1 = new_albums_length1;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				if (!(_tmp16_ <= (_tmp17__length1 - 1))) {
+				if (!(_tmp10_ <= (_tmp11__length1 - 1))) {
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					break;
-#line 8500 "GalleryConnector.c"
+#line 8675 "GalleryConnector.c"
 				}
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp18_ = self->priv->albums;
+				_tmp12_ = self->priv->albums;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp18__length1 = self->priv->albums_length1;
+				_tmp12__length1 = self->priv->albums_length1;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp19_ = new_albums;
+				_tmp13_ = new_albums;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp19__length1 = new_albums_length1;
+				_tmp13__length1 = new_albums_length1;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp20_ = i;
+				_tmp14_ = i;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp21_ = _tmp19_[_tmp20_];
+				_tmp15_ = _tmp13_[_tmp14_];
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_tmp22_ = _publishing_gallery3_album_ref0 (_tmp21_);
+				_tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_);
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-				_vala_array_add5 (&self->priv->albums, &self->priv->albums_length1, &self->priv->_albums_size_, _tmp22_);
-#line 8518 "GalleryConnector.c"
+				_vala_array_add5 (&self->priv->albums, &self->priv->albums_length1, &self->priv->_albums_size_, _tmp16_);
+#line 8693 "GalleryConnector.c"
 			}
 		}
 	}
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23_ = txn;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp24_ = publishing_gallery3_get_albums_transaction_get_more_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp23_) : NULL);
+	_tmp17_ = publishing_gallery3_get_albums_transaction_get_more_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp25_ = _tmp24_;
+	_tmp18_ = _tmp17_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp25_) {
-#line 8530 "GalleryConnector.c"
-		PublishingRESTSupportTransaction* _tmp26_;
-		gchar** _tmp27_;
-		gint _tmp27__length1;
-		gchar** _tmp28_;
-		gint _tmp28__length1;
-		PublishingRESTSupportTransaction* _tmp29_;
-		guint _tmp30_;
-		guint _tmp31_;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp26_ = txn;
+	if (_tmp18_) {
+#line 8703 "GalleryConnector.c"
+		gchar** _tmp19_;
+		gint _tmp19__length1;
+		gchar** _tmp20_;
+		gint _tmp20__length1;
+		guint _tmp21_;
+		guint _tmp22_;
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp27_ = publishing_gallery3_get_albums_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp26_) : NULL, &_tmp27__length1);
+		_tmp19_ = publishing_gallery3_get_albums_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL, &_tmp19__length1);
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp28_ = _tmp27_;
+		_tmp20_ = _tmp19_;
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp28__length1 = _tmp27__length1;
+		_tmp20__length1 = _tmp19__length1;
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp29_ = txn;
+		_tmp21_ = publishing_gallery3_get_albums_transaction_get_urls_sent (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL);
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp30_ = publishing_gallery3_get_albums_transaction_get_urls_sent (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp29_) : NULL);
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp31_ = _tmp30_;
+		_tmp22_ = _tmp21_;
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp28_, _tmp28__length1, _tmp31_);
-#line 8555 "GalleryConnector.c"
+		publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp20_, _tmp20__length1, _tmp22_);
+#line 8722 "GalleryConnector.c"
 	} else {
 		gchar* url = NULL;
-		PublishingGallery3Session* _tmp32_;
-		const gchar* _tmp33_;
-		const gchar* _tmp34_;
-		gchar* _tmp35_;
+		PublishingGallery3Session* _tmp23_;
+		const gchar* _tmp24_;
+		const gchar* _tmp25_;
+		gchar* _tmp26_;
 		gchar* username = NULL;
-		PublishingGallery3Session* _tmp36_;
-		const gchar* _tmp37_;
-		const gchar* _tmp38_;
-		gchar* _tmp39_;
-		const gchar* _tmp40_;
-		const gchar* _tmp41_;
+		PublishingGallery3Session* _tmp27_;
+		const gchar* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
+		const gchar* _tmp31_;
+		const gchar* _tmp32_;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp32_ = self->priv->session;
+		_tmp23_ = self->priv->session;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp33_ = publishing_gallery3_session_get_url (_tmp32_);
+		_tmp24_ = publishing_gallery3_session_get_url (_tmp23_);
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp34_ = _tmp33_;
+		_tmp25_ = _tmp24_;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp35_ = g_strdup (_tmp34_);
+		_tmp26_ = g_strdup (_tmp25_);
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		url = _tmp35_;
+		url = _tmp26_;
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp36_ = self->priv->session;
+		_tmp27_ = self->priv->session;
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp37_ = publishing_gallery3_session_get_username (_tmp36_);
+		_tmp28_ = publishing_gallery3_session_get_username (_tmp27_);
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp38_ = _tmp37_;
+		_tmp29_ = _tmp28_;
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp39_ = g_strdup (_tmp38_);
+		_tmp30_ = g_strdup (_tmp29_);
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		username = _tmp39_;
+		username = _tmp30_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp40_ = url;
+		_tmp31_ = url;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp41_ = username;
+		_tmp32_ = username;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp40_, _tmp41_);
+		publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp31_, _tmp32_);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (username);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url);
-#line 8599 "GalleryConnector.c"
+#line 8766 "GalleryConnector.c"
 	}
 #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
-#line 8603 "GalleryConnector.c"
+#line 8770 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self,
+                                                             PublishingRESTSupportTransaction* bad_txn,
+                                                             GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PublishingRESTSupportTransaction* _tmp10_;
-	guint _tmp11_;
+	PublishingGallery3Session* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = bad_txn;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_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_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self);
 #line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
 #line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8642 "GalleryConnector.c"
+#line 8800 "GalleryConnector.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp6_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8652 "GalleryConnector.c"
+#line 8808 "GalleryConnector.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = bad_txn;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+	_tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
 #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("EVENT: network transaction to create an album " "failed; response = \'%s\'.", _tmp9_);
+	g_debug ("EVENT: network transaction to create an album " "failed; response = \'%s\'.", _tmp4_);
 #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp9_);
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = bad_txn;
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
+	_g_free0 (_tmp4_);
 #line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp11_ == ((guint) 403)) {
+	if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
 #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 8672 "GalleryConnector.c"
+#line 8822 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_;
-		guint _tmp13_;
 #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = bad_txn;
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (_tmp13_ == ((guint) 400)) {
+		if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
 #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 8684 "GalleryConnector.c"
+#line 8828 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_;
-			GError* _tmp15_;
+			SpitPublishingPluginHost* _tmp5_;
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp14_ = self->priv->host;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp15_ = err;
+			_tmp5_ = self->priv->host;
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8694 "GalleryConnector.c"
+			spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8835 "GalleryConnector.c"
 		}
 	}
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self,
+                                                                PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
+	PublishingGallery3Session* _tmp2_;
 	PublishingGallery3PublishingParameters* new_params = NULL;
-	PublishingRESTSupportTransaction* _tmp7_;
-	PublishingGallery3PublishingParameters* _tmp8_;
+	PublishingGallery3PublishingParameters* _tmp3_;
+	PublishingGallery3PublishingParameters* _tmp4_;
+	PublishingGallery3PublishingParameters* _tmp5_;
+	PublishingGallery3PublishingParameters* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	PublishingGallery3PublishingParameters* _tmp9_;
-	PublishingGallery3PublishingParameters* _tmp10_;
-	PublishingGallery3PublishingParameters* _tmp11_;
-	PublishingRESTSupportTransaction* _tmp12_;
-	gchar* _tmp13_;
-	gchar* _tmp14_;
-	PublishingGallery3PublishingParameters* _tmp15_;
-	const gchar* _tmp16_;
-	const gchar* _tmp17_;
-	PublishingGallery3PublishingParameters* _tmp18_;
+	const gchar* _tmp10_;
+	const gchar* _tmp11_;
+	PublishingGallery3PublishingParameters* _tmp12_;
 #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = txn;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_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_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self);
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8743 "GalleryConnector.c"
+#line 8875 "GalleryConnector.c"
 	}
 #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp6_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8753 "GalleryConnector.c"
+#line 8883 "GalleryConnector.c"
 	}
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = txn;
+	_tmp3_ = publishing_gallery3_gallery_album_create_transaction_get_parameters (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) txn) : NULL);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_gallery3_gallery_album_create_transaction_get_parameters (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) _tmp7_) : NULL);
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp9_);
+	_tmp5_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp4_);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	new_params = _tmp10_;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = new_params;
+	new_params = _tmp5_;
 #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = txn;
+	_tmp6_ = new_params;
 #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = publishing_gallery3_gallery_album_create_transaction_get_new_album_path (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) _tmp12_) : NULL);
+	_tmp7_ = publishing_gallery3_gallery_album_create_transaction_get_new_album_path (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) txn) : NULL);
 #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = _tmp13_;
+	_tmp8_ = _tmp7_;
 #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_publishing_parameters_set_album_path (_tmp11_, _tmp14_);
+	publishing_gallery3_publishing_parameters_set_album_path (_tmp6_, _tmp8_);
 #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp14_);
+	_g_free0 (_tmp8_);
 #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = new_params;
+	_tmp9_ = new_params;
 #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp15_);
+	_tmp10_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp9_);
 #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = _tmp16_;
+	_tmp11_ = _tmp10_;
 #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1391: EVENT: user has created an album at \"%s\"" \
-".", _tmp17_);
+".", _tmp11_);
 #line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = new_params;
+	_tmp12_ = new_params;
 #line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_gallery_publisher_do_publish (self, _tmp18_);
+	publishing_gallery3_gallery_publisher_do_publish (self, _tmp12_);
 #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_gallery3_publishing_parameters_unref0 (new_params);
-#line 8791 "GalleryConnector.c"
+#line 8917 "GalleryConnector.c"
 }
 
 
-static gpointer _publishing_rest_support_batch_uploader_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_batch_uploader_ref0 (gpointer self)
+{
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? publishing_rest_support_batch_uploader_ref (self) : NULL;
-#line 8798 "GalleryConnector.c"
+#line 8926 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err) {
-	gboolean _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self,
+                                                        PublishingRESTSupportBatchUploader* _uploader,
+                                                        GError* err)
+{
 	PublishingGallery3Uploader* uploader = NULL;
-	PublishingRESTSupportBatchUploader* _tmp1_;
-	PublishingGallery3Uploader* _tmp2_;
+	PublishingGallery3Uploader* _tmp0_;
 	GError* g3_err = NULL;
-	GError* _tmp3_;
-	GError* _tmp4_;
-	GError* _tmp5_;
-	const gchar* _tmp6_;
-	PublishingGallery3Uploader* _tmp7_;
-	const gchar* _tmp8_;
-	const gchar* _tmp9_;
-	PublishingGallery3Uploader* _tmp10_;
-	guint _tmp11_;
+	GError* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingGallery3Uploader* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	PublishingGallery3Uploader* _tmp6_;
+	guint _tmp7_;
+	guint _tmp8_;
+	PublishingGallery3Uploader* _tmp9_;
+	guint _tmp10_;
+	PublishingGallery3Uploader* _tmp11_;
 	guint _tmp12_;
 	PublishingGallery3Uploader* _tmp13_;
 	guint _tmp14_;
-	PublishingGallery3Uploader* _tmp15_;
-	guint _tmp16_;
-	PublishingGallery3Uploader* _tmp17_;
-	guint _tmp18_;
-	guint _tmp19_;
-	SpitPublishingPluginHost* _tmp36_;
-	GError* _tmp37_;
+	guint _tmp15_;
+	SpitPublishingPluginHost* _tmp32_;
+	GError* _tmp33_;
 #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (_uploader));
 #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8837 "GalleryConnector.c"
+#line 8963 "GalleryConnector.c"
 	}
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = _uploader;
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = _publishing_rest_support_batch_uploader_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, PUBLISHING_GALLERY3_TYPE_UPLOADER) ? ((PublishingGallery3Uploader*) _tmp1_) : NULL);
+	_tmp0_ = _publishing_rest_support_batch_uploader_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_uploader, PUBLISHING_GALLERY3_TYPE_UPLOADER) ? ((PublishingGallery3Uploader*) _uploader) : NULL);
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	uploader = _tmp2_;
+	uploader = _tmp0_;
 #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = err;
+	_tmp1_ = g_error_copy (err);
 #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = g_error_copy (_tmp3_);
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g3_err = _tmp4_;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = err;
+	g3_err = _tmp1_;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = _tmp5_->message;
+	_tmp2_ = err->message;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = uploader;
+	_tmp3_ = uploader;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp7_);
+	_tmp4_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp3_);
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = _tmp8_;
+	_tmp5_ = _tmp4_;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = uploader;
+	_tmp6_ = uploader;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = publishing_gallery3_uploader_get_status_code (_tmp10_);
+	_tmp7_ = publishing_gallery3_uploader_get_status_code (_tmp6_);
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = _tmp11_;
+	_tmp8_ = _tmp7_;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("EVENT: uploader reports upload error = '%s' " "for file '%s' (code %d)", _tmp6_, _tmp9_, _tmp12_);
+	g_debug ("EVENT: uploader reports upload error = '%s' " "for file '%s' (code %d)", _tmp2_, _tmp5_, _tmp8_);
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = uploader;
+	_tmp9_ = uploader;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp14_, NULL, FALSE);
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp10_, NULL, FALSE);
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = uploader;
+	_tmp11_ = uploader;
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp16_, NULL, FALSE);
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp12_, NULL, FALSE);
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = uploader;
+	_tmp13_ = uploader;
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = publishing_gallery3_uploader_get_status_code (_tmp17_);
+	_tmp14_ = publishing_gallery3_uploader_get_status_code (_tmp13_);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = _tmp18_;
+	_tmp15_ = _tmp14_;
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp19_ == ((guint) 400)) {
-#line 8889 "GalleryConnector.c"
-		GError* _tmp20_;
-		GError* _tmp21_;
-		const gchar* _tmp22_;
-		PublishingGallery3Uploader* _tmp23_;
-		const gchar* _tmp24_;
-		const gchar* _tmp25_;
-		gchar* _tmp26_;
-		gchar* _tmp27_;
-		gchar* _tmp28_;
-		PublishingGallery3Uploader* _tmp29_;
-		SpitPublishingPublisherMediaType _tmp30_;
-		SpitPublishingPublisherMediaType _tmp31_;
+	if (_tmp15_ == ((guint) 400)) {
+#line 9009 "GalleryConnector.c"
+		GError* _tmp16_;
+		GError* _tmp17_;
+		const gchar* _tmp18_;
+		PublishingGallery3Uploader* _tmp19_;
+		const gchar* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gchar* _tmp24_;
+		PublishingGallery3Uploader* _tmp25_;
+		SpitPublishingPublisherMediaType _tmp26_;
+		SpitPublishingPublisherMediaType _tmp27_;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp20_ = g3_err;
+		_tmp16_ = g3_err;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp21_ = g3_err;
+		_tmp17_ = g3_err;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp22_ = _tmp21_->message;
+		_tmp18_ = _tmp17_->message;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp23_ = uploader;
+		_tmp19_ = uploader;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp24_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp23_);
+		_tmp20_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp19_);
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp25_ = _tmp24_;
+		_tmp21_ = _tmp20_;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp26_ = g_strdup_printf (PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG, _tmp25_);
+		_tmp22_ = g_strdup_printf (PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG, _tmp21_);
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp27_ = _tmp26_;
+		_tmp23_ = _tmp22_;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp28_ = g_strconcat (_tmp22_, _tmp27_, NULL);
+		_tmp24_ = g_strconcat (_tmp18_, _tmp23_, NULL);
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_free0 (_tmp21_->message);
+		_g_free0 (_tmp17_->message);
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp21_->message = _tmp28_;
+		_tmp17_->message = _tmp24_;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_free0 (_tmp27_);
+		_g_free0 (_tmp23_);
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp29_ = uploader;
+		_tmp25_ = uploader;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp30_ = publishing_gallery3_uploader_get_current_publishable_type (_tmp29_);
+		_tmp26_ = publishing_gallery3_uploader_get_current_publishable_type (_tmp25_);
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp31_ = _tmp30_;
+		_tmp27_ = _tmp26_;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (_tmp31_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 8934 "GalleryConnector.c"
-			GError* _tmp32_;
-			GError* _tmp33_;
-			const gchar* _tmp34_;
-			gchar* _tmp35_;
+		if (_tmp27_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 9054 "GalleryConnector.c"
+			GError* _tmp28_;
+			GError* _tmp29_;
+			const gchar* _tmp30_;
+			gchar* _tmp31_;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp32_ = g3_err;
+			_tmp28_ = g3_err;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp33_ = g3_err;
+			_tmp29_ = g3_err;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp34_ = _tmp33_->message;
+			_tmp30_ = _tmp29_->message;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp35_ = g_strconcat (_tmp34_, PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG, NULL);
+			_tmp31_ = g_strconcat (_tmp30_, PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG, NULL);
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_g_free0 (_tmp33_->message);
+			_g_free0 (_tmp29_->message);
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp33_->message = _tmp35_;
-#line 8951 "GalleryConnector.c"
+			_tmp29_->message = _tmp31_;
+#line 9071 "GalleryConnector.c"
 		}
 	}
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp36_ = self->priv->host;
+	_tmp32_ = self->priv->host;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp37_ = g3_err;
+	_tmp33_ = g3_err;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_publishing_plugin_host_post_error (_tmp36_, _tmp37_);
+	spit_publishing_plugin_host_post_error (_tmp32_, _tmp33_);
 #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_error_free0 (g3_err);
 #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 8964 "GalleryConnector.c"
+#line 9084 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* 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_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self,
+                                                                gint file_number,
+                                                                gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
 #line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8985 "GalleryConnector.c"
+#line 9103 "GalleryConnector.c"
 	}
 #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = completed_fraction;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1432: EVENT: uploader reports upload %.2f percen" \
-"t complete.", 100.0 * _tmp1_);
+"t complete.", 100.0 * completed_fraction);
 #line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = self->priv->progress_reporter;
+	_tmp0_ = self->priv->progress_reporter;
 #line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
+	_tmp0__target = self->priv->progress_reporter_target;
 #line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = self->priv->progress_reporter;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
 #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = file_number;
+	_tmp1_ = self->priv->progress_reporter;
 #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = completed_fraction;
+	_tmp1__target = self->priv->progress_reporter_target;
 #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 9007 "GalleryConnector.c"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 9119 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self,
+                                                           PublishingRESTSupportBatchUploader* uploader,
+                                                           gint num_published)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
-	gboolean _tmp6_;
-	gint _tmp7_;
+	PublishingGallery3Session* _tmp2_;
 #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
 #line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = uploader;
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_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_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9042 "GalleryConnector.c"
+#line 9147 "GalleryConnector.c"
 	}
 #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp6_) {
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9052 "GalleryConnector.c"
+#line 9155 "GalleryConnector.c"
 	}
 #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = num_published;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1454: EVENT: publishing complete; %d items publi" \
-"shed", _tmp7_);
+"shed", num_published);
 #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_do_show_success_pane (self);
-#line 9060 "GalleryConnector.c"
+#line 9161 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self)
+{
 	PublishingGallery3PublishingOptionsPane* _tmp0_;
 	guint _tmp1_;
 	PublishingGallery3PublishingOptionsPane* _tmp2_;
 	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3Session* _tmp5_;
+	PublishingGallery3Session* _tmp4_;
 #line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9122,33 +9224,31 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log
 #line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self);
 #line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9091 "GalleryConnector.c"
+#line 9191 "GalleryConnector.c"
 	}
 #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1470: EVENT: user is attempting to log out.");
 #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->session;
+	_tmp4_ = self->priv->session;
 #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_session_deauthenticate (_tmp5_);
+	publishing_gallery3_session_deauthenticate (_tmp4_);
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 9101 "GalleryConnector.c"
+#line 9201 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
+static void
+publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self,
+                                                                          PublishingGallery3PublishingParameters* parameters)
+{
 	PublishingGallery3PublishingOptionsPane* _tmp0_;
 	guint _tmp1_;
 	PublishingGallery3PublishingOptionsPane* _tmp2_;
 	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingGallery3PublishingParameters* _tmp5_;
-	gboolean _tmp6_;
 #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9166,63 +9266,52 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub
 #line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self);
 #line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9135 "GalleryConnector.c"
+#line 9233 "GalleryConnector.c"
 	}
 #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1485: EVENT: user is attempting to publish somet" \
 "hing.");
 #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = parameters;
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_gallery3_publishing_parameters_is_to_new_album (_tmp5_);
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp6_) {
-#line 9145 "GalleryConnector.c"
-		PublishingGallery3PublishingParameters* _tmp7_;
-		const gchar* _tmp8_;
-		const gchar* _tmp9_;
-		PublishingGallery3PublishingParameters* _tmp10_;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = parameters;
+	if (publishing_gallery3_publishing_parameters_is_to_new_album (parameters)) {
+#line 9239 "GalleryConnector.c"
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
 #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = publishing_gallery3_publishing_parameters_get_album_name (_tmp7_);
+		_tmp4_ = publishing_gallery3_publishing_parameters_get_album_name (parameters);
 #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = _tmp8_;
+		_tmp5_ = _tmp4_;
 #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		g_debug ("GalleryConnector.vala:1488: EVENT: must create new album \"%s\" first.", _tmp9_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = parameters;
+		g_debug ("GalleryConnector.vala:1488: EVENT: must create new album \"%s\" first.", _tmp5_);
 #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_do_create_album (self, _tmp10_);
-#line 9162 "GalleryConnector.c"
+		publishing_gallery3_gallery_publisher_do_create_album (self, parameters);
+#line 9250 "GalleryConnector.c"
 	} else {
-		PublishingGallery3PublishingParameters* _tmp11_;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = parameters;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		publishing_gallery3_gallery_publisher_do_publish (self, _tmp11_);
-#line 9169 "GalleryConnector.c"
+		publishing_gallery3_gallery_publisher_do_publish (self, parameters);
+#line 9254 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_gallery_publisher_class_init (PublishingGallery3GalleryPublisherClass * klass) {
+static void
+publishing_gallery3_gallery_publisher_class_init (PublishingGallery3GalleryPublisherClass * klass)
+{
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_parent_class = g_type_class_peek_parent (klass);
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryPublisherPrivate));
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_gallery_publisher_finalize;
-#line 9181 "GalleryConnector.c"
+#line 9268 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_gallery3_gallery_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9233,11 +9322,13 @@ static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_inte
 	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_start;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_stop;
-#line 9196 "GalleryConnector.c"
+#line 9285 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_instance_init (PublishingGallery3GalleryPublisher * self) {
+static void
+publishing_gallery3_gallery_publisher_instance_init (PublishingGallery3GalleryPublisher * self)
+{
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_GALLERY_PUBLISHER_GET_PRIVATE (self);
 #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9264,11 +9355,13 @@ static void publishing_gallery3_gallery_publisher_instance_init (PublishingGalle
 	self->priv->key = NULL;
 #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->publishing_options_pane = NULL;
-#line 9227 "GalleryConnector.c"
+#line 9318 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_gallery_publisher_finalize (GObject * obj) {
+static void
+publishing_gallery3_gallery_publisher_finalize (GObject * obj)
+{
 	PublishingGallery3GalleryPublisher * self;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
@@ -9290,11 +9383,13 @@ static void publishing_gallery3_gallery_publisher_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->publishing_options_pane);
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (publishing_gallery3_gallery_publisher_parent_class)->finalize (obj);
-#line 9253 "GalleryConnector.c"
+#line 9346 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_gallery_publisher_get_type (void) {
+GType
+publishing_gallery3_gallery_publisher_get_type (void)
+{
 	static volatile gsize publishing_gallery3_gallery_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_gallery_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryPublisher), 0, (GInstanceInitFunc) publishing_gallery3_gallery_publisher_instance_init, NULL };
@@ -9308,143 +9403,156 @@ GType publishing_gallery3_gallery_publisher_get_type (void) {
 }
 
 
-static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self, int length) {
+static PublishingGallery3Album**
+_vala_array_dup3 (PublishingGallery3Album** self,
+                  int length)
+{
 	PublishingGallery3Album** result;
 	int i;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = g_new0 (PublishingGallery3Album*, length + 1);
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	for (i = 0; i < length; i++) {
-#line 9278 "GalleryConnector.c"
+#line 9376 "GalleryConnector.c"
 		PublishingGallery3Album* _tmp0_;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = _publishing_gallery3_album_ref0 (self[i]);
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		result[i] = _tmp0_;
-#line 9284 "GalleryConnector.c"
+#line 9382 "GalleryConnector.c"
 	}
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 9288 "GalleryConnector.c"
+#line 9386 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                               gpointer self)
+{
 #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9295 "GalleryConnector.c"
+#line 9396 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                             gpointer self)
+{
 #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9302 "GalleryConnector.c"
+#line 9406 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                              gpointer self)
+{
 #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_on_new_album_entry_changed ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9309 "GalleryConnector.c"
+#line 9416 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                                  gpointer self)
+{
 #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9316 "GalleryConnector.c"
+#line 9426 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                     gpointer self)
+{
 #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_on_pixels_changed ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9323 "GalleryConnector.c"
+#line 9436 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                   gpointer self)
+{
 #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_on_logout_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9330 "GalleryConnector.c"
+#line 9446 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                    gpointer self)
+{
 #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_on_publish_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9337 "GalleryConnector.c"
-}
-
-
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) {
+#line 9456 "GalleryConnector.c"
+}
+
+
+PublishingGallery3PublishingOptionsPane*
+publishing_gallery3_publishing_options_pane_construct (GType object_type,
+                                                       SpitPublishingPluginHost* host,
+                                                       const gchar* url,
+                                                       const gchar* username,
+                                                       PublishingGallery3Album** albums,
+                                                       int albums_length1,
+                                                       GtkBuilder* builder,
+                                                       gboolean strip_metadata,
+                                                       gint scaling_id,
+                                                       gint scaling_pixels)
+{
 	PublishingGallery3PublishingOptionsPane * self = NULL;
 	PublishingGallery3Album** _tmp0_;
 	gint _tmp0__length1;
-	PublishingGallery3Album** _tmp1_;
-	gint _tmp1__length1;
-	SpitPublishingPluginHost* _tmp2_;
-	GtkBuilder* _tmp3_;
-	GtkBuilder* _tmp4_;
-	GtkBuilder* _tmp5_;
-	GtkBuilder* _tmp6_;
-	GSList* _tmp7_;
-	GSList* _tmp8_;
-	guint _tmp9_;
-	GtkBuilder* _tmp10_;
-	GObject* _tmp11_;
-	GtkGrid* _tmp12_;
-	GtkBuilder* _tmp13_;
+	GtkBuilder* _tmp1_;
+	GSList* _tmp2_;
+	GSList* _tmp3_;
+	GObject* _tmp4_;
+	GtkGrid* _tmp5_;
+	GObject* _tmp6_;
+	GtkLabel* _tmp7_;
+	GObject* _tmp8_;
+	GtkRadioButton* _tmp9_;
+	GObject* _tmp10_;
+	GtkComboBoxText* _tmp11_;
+	GObject* _tmp12_;
+	GtkComboBoxText* _tmp13_;
 	GObject* _tmp14_;
-	GtkLabel* _tmp15_;
-	GtkBuilder* _tmp16_;
-	GObject* _tmp17_;
-	GtkRadioButton* _tmp18_;
-	GtkBuilder* _tmp19_;
-	GObject* _tmp20_;
-	GtkComboBoxText* _tmp21_;
-	GtkBuilder* _tmp22_;
+	GtkEntry* _tmp15_;
+	GObject* _tmp16_;
+	GtkRadioButton* _tmp17_;
+	GObject* _tmp18_;
+	GtkEntry* _tmp19_;
+	GtkBuilder* _tmp20_;
+	GObject* _tmp21_;
+	GtkCheckButton* _tmp22_;
 	GObject* _tmp23_;
-	GtkComboBoxText* _tmp24_;
-	GtkBuilder* _tmp25_;
-	GObject* _tmp26_;
-	GtkEntry* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_;
-	GtkRadioButton* _tmp30_;
-	GtkBuilder* _tmp31_;
-	GObject* _tmp32_;
-	GtkEntry* _tmp33_;
-	GtkBuilder* _tmp34_;
-	GObject* _tmp35_;
-	GtkCheckButton* _tmp36_;
-	GtkBuilder* _tmp37_;
-	GObject* _tmp38_;
-	GtkButton* _tmp39_;
-	GtkBuilder* _tmp40_;
-	GObject* _tmp41_;
-	GtkButton* _tmp42_;
-	GtkLabel* _tmp43_;
-	const gchar* _tmp44_;
-	const gchar* _tmp45_;
-	gchar* _tmp46_;
-	gchar* _tmp47_;
-	GtkCheckButton* _tmp48_;
-	gboolean _tmp49_;
-	GtkComboBoxText* _tmp50_;
-	gint _tmp51_;
-	GtkEntry* _tmp52_;
-	gint _tmp53_;
-	gchar* _tmp54_;
-	gchar* _tmp55_;
-	GtkRadioButton* _tmp56_;
-	GtkRadioButton* _tmp57_;
-	GtkEntry* _tmp58_;
-	GtkComboBoxText* _tmp59_;
-	GtkEntry* _tmp60_;
-	GtkButton* _tmp61_;
-	GtkButton* _tmp62_;
+	GtkButton* _tmp24_;
+	GObject* _tmp25_;
+	GtkButton* _tmp26_;
+	GtkLabel* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	GtkCheckButton* _tmp30_;
+	GtkComboBoxText* _tmp31_;
+	GtkEntry* _tmp32_;
+	gchar* _tmp33_;
+	gchar* _tmp34_;
+	GtkRadioButton* _tmp35_;
+	GtkRadioButton* _tmp36_;
+	GtkEntry* _tmp37_;
+	GtkComboBoxText* _tmp38_;
+	GtkEntry* _tmp39_;
+	GtkButton* _tmp40_;
+	GtkButton* _tmp41_;
 #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9456,430 +9564,382 @@ PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_
 #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3PublishingOptionsPane*) g_object_new (object_type, NULL);
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = albums;
+	_tmp0_ = (albums != NULL) ? _vala_array_dup3 (albums, albums_length1) : ((gpointer) albums);
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0__length1 = albums_length1;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->albums = _tmp1_;
+	self->priv->albums = _tmp0_;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->albums_length1 = _tmp1__length1;
+	self->priv->albums_length1 = _tmp0__length1;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
 #line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = host;
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->host = _tmp2_;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = builder;
+	self->priv->host = host;
 #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
+	_tmp1_ = _g_object_ref0 (builder);
 #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->builder);
 #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->builder = _tmp4_;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = builder;
+	self->priv->builder = _tmp1_;
 #line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_vala_assert (NULL != _tmp5_, "null != builder");
+	_vala_assert (NULL != builder, "null != builder");
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = builder;
+	_tmp2_ = gtk_builder_get_objects (builder);
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = gtk_builder_get_objects (_tmp6_);
+	_tmp3_ = _tmp2_;
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = _tmp7_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = g_slist_length (_tmp8_);
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_vala_assert (_tmp9_ > ((guint) 0), "builder.get_objects().length() > 0");
+	_vala_assert (g_slist_length (_tmp3_) > ((guint) 0), "builder.get_objects().length() > 0");
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_slist_free0 (_tmp8_);
+	_g_slist_free0 (_tmp3_);
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = builder;
+	_tmp4_ = gtk_builder_get_object (builder, "pane_widget");
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = gtk_builder_get_object (_tmp10_, "pane_widget");
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp11_) : NULL);
+	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp4_) : NULL);
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->pane_widget);
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->pane_widget = _tmp12_;
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = builder;
+	self->priv->pane_widget = _tmp5_;
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "title_label");
+	_tmp6_ = gtk_builder_get_object (builder, "title_label");
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp14_) : NULL);
+	_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp6_) : NULL);
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->title_label);
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->title_label = _tmp15_;
+	self->priv->title_label = _tmp7_;
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = builder;
+	_tmp8_ = gtk_builder_get_object (builder, "publish_to_existing_radio");
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "publish_to_existing_radio");
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp17_) : NULL);
+	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp8_) : NULL);
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->use_existing_radio = _tmp18_;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = builder;
+	self->priv->use_existing_radio = _tmp9_;
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "existing_albums_combo");
+	_tmp10_ = gtk_builder_get_object (builder, "existing_albums_combo");
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp20_) : NULL);
+	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp10_) : NULL);
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->existing_albums_combo = _tmp21_;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp22_ = builder;
+	self->priv->existing_albums_combo = _tmp11_;
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23_ = gtk_builder_get_object (_tmp22_, "scaling_constraint_combo");
+	_tmp12_ = gtk_builder_get_object (builder, "scaling_constraint_combo");
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp23_) : NULL);
+	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp12_) : NULL);
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->scaling_combo);
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->scaling_combo = _tmp24_;
+	self->priv->scaling_combo = _tmp13_;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp25_ = builder;
+	_tmp14_ = gtk_builder_get_object (builder, "major_axis_pixels");
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "major_axis_pixels");
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
+	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL);
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->pixels);
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->pixels = _tmp27_;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp28_ = builder;
+	self->priv->pixels = _tmp15_;
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "publish_new_radio");
+	_tmp16_ = gtk_builder_get_object (builder, "publish_new_radio");
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp29_) : NULL);
+	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp16_) : NULL);
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->create_new_radio = _tmp30_;
+	self->priv->create_new_radio = _tmp17_;
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp31_ = builder;
+	_tmp18_ = gtk_builder_get_object (builder, "new_album_name");
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp32_ = gtk_builder_get_object (_tmp31_, "new_album_name");
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL);
+	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->new_album_entry);
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->new_album_entry = _tmp33_;
+	self->priv->new_album_entry = _tmp19_;
 #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp34_ = self->priv->builder;
+	_tmp20_ = self->priv->builder;
 #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp35_ = gtk_builder_get_object (_tmp34_, "strip_metadata_check");
+	_tmp21_ = gtk_builder_get_object (_tmp20_, "strip_metadata_check");
 #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp35_) : NULL);
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp21_) : NULL);
 #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
 #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->strip_metadata_check = _tmp36_;
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp37_ = builder;
+	self->priv->strip_metadata_check = _tmp22_;
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp38_ = gtk_builder_get_object (_tmp37_, "publish_button");
+	_tmp23_ = gtk_builder_get_object (builder, "publish_button");
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, gtk_button_get_type ()) ? ((GtkButton*) _tmp38_) : NULL);
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->publish_button);
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->publish_button = _tmp39_;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp40_ = builder;
+	self->priv->publish_button = _tmp24_;
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp41_ = gtk_builder_get_object (_tmp40_, "logout_button");
+	_tmp25_ = gtk_builder_get_object (builder, "logout_button");
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, gtk_button_get_type ()) ? ((GtkButton*) _tmp41_) : NULL);
+	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->logout_button);
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->logout_button = _tmp42_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp43_ = self->priv->title_label;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp44_ = url;
+	self->priv->logout_button = _tmp26_;
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp45_ = username;
+	_tmp27_ = self->priv->title_label;
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp46_ = g_strdup_printf (_ ("Publishing to %s as %s."), _tmp44_, _tmp45_);
+	_tmp28_ = g_strdup_printf (_ ("Publishing to %s as %s."), url, username);
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp47_ = _tmp46_;
+	_tmp29_ = _tmp28_;
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_label_set_label (_tmp43_, _tmp47_);
+	gtk_label_set_label (_tmp27_, _tmp29_);
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp47_);
+	_g_free0 (_tmp29_);
 #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp48_ = self->priv->strip_metadata_check;
+	_tmp30_ = self->priv->strip_metadata_check;
 #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp49_ = strip_metadata;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_);
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp50_ = self->priv->scaling_combo;
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton), strip_metadata);
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp51_ = scaling_id;
+	_tmp31_ = self->priv->scaling_combo;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), _tmp51_);
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp52_ = self->priv->pixels;
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), scaling_id);
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp53_ = scaling_pixels;
+	_tmp32_ = self->priv->pixels;
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp54_ = g_strdup_printf ("%i", _tmp53_);
+	_tmp33_ = g_strdup_printf ("%i", scaling_pixels);
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp55_ = _tmp54_;
+	_tmp34_ = _tmp33_;
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_entry_set_text (_tmp52_, _tmp55_);
+	gtk_entry_set_text (_tmp32_, _tmp34_);
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp55_);
+	_g_free0 (_tmp34_);
 #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp56_ = self->priv->use_existing_radio;
+	_tmp35_ = self->priv->use_existing_radio;
 #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
 #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp57_ = self->priv->create_new_radio;
+	_tmp36_ = self->priv->create_new_radio;
 #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
 #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp58_ = self->priv->new_album_entry;
+	_tmp37_ = self->priv->new_album_entry;
 #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
 #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp59_ = self->priv->scaling_combo;
+	_tmp38_ = self->priv->scaling_combo;
 #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0);
 #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp60_ = self->priv->pixels;
+	_tmp39_ = self->priv->pixels;
 #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0);
 #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp61_ = self->priv->logout_button;
+	_tmp40_ = self->priv->logout_button;
 #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp40_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp62_ = self->priv->publish_button;
+	_tmp41_ = self->priv->publish_button;
 #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp41_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 9640 "GalleryConnector.c"
+#line 9704 "GalleryConnector.c"
 }
 
 
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) {
+PublishingGallery3PublishingOptionsPane*
+publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host,
+                                                 const gchar* url,
+                                                 const gchar* username,
+                                                 PublishingGallery3Album** albums,
+                                                 int albums_length1,
+                                                 GtkBuilder* builder,
+                                                 gboolean strip_metadata,
+                                                 gint scaling_id,
+                                                 gint scaling_pixels)
+{
 #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_publishing_options_pane_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, host, url, username, albums, albums_length1, builder, strip_metadata, scaling_id, scaling_pixels);
-#line 9647 "GalleryConnector.c"
+#line 9721 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
 	gchar* album_name = NULL;
 	gint _tmp0_ = 0;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
 	gint photo_major_axis_size = 0;
 	PublishingGallery3PublishingParameters* param = NULL;
-	GtkRadioButton* _tmp6_;
-	gboolean _tmp7_;
-	PublishingGallery3PublishingParameters* _tmp34_;
-	gint _tmp35_;
-	PublishingGallery3PublishingParameters* _tmp36_;
-	GtkCheckButton* _tmp37_;
-	gboolean _tmp38_;
-	PublishingGallery3PublishingParameters* _tmp39_;
+	GtkRadioButton* _tmp4_;
+	PublishingGallery3PublishingParameters* _tmp29_;
+	gint _tmp30_;
+	PublishingGallery3PublishingParameters* _tmp31_;
+	GtkCheckButton* _tmp32_;
+	PublishingGallery3PublishingParameters* _tmp33_;
 #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = self->priv->scaling_combo;
 #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp2_ == 1) {
-#line 9674 "GalleryConnector.c"
-		GtkEntry* _tmp3_;
-		const gchar* _tmp4_;
-		gint _tmp5_;
-#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = self->priv->pixels;
+	if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) == 1) {
+#line 9745 "GalleryConnector.c"
+		GtkEntry* _tmp2_;
+		const gchar* _tmp3_;
 #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = gtk_entry_get_text (_tmp3_);
+		_tmp2_ = self->priv->pixels;
 #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = atoi (_tmp4_);
+		_tmp3_ = gtk_entry_get_text (_tmp2_);
 #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp0_ = _tmp5_;
-#line 9686 "GalleryConnector.c"
+		_tmp0_ = atoi (_tmp3_);
+#line 9754 "GalleryConnector.c"
 	} else {
 #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = -1;
-#line 9690 "GalleryConnector.c"
+#line 9758 "GalleryConnector.c"
 	}
 #line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	photo_major_axis_size = _tmp0_;
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = self->priv->create_new_radio;
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp4_ = self->priv->create_new_radio;
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp7_) {
-#line 9700 "GalleryConnector.c"
-		GtkEntry* _tmp8_;
+	if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 9766 "GalleryConnector.c"
+		GtkEntry* _tmp5_;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		SpitPublishingPluginHost* _tmp8_;
 		const gchar* _tmp9_;
-		gchar* _tmp10_;
-		SpitPublishingPluginHost* _tmp11_;
+		const gchar* _tmp10_;
+		PublishingGallery3PublishingParameters* _tmp11_;
 		const gchar* _tmp12_;
-		const gchar* _tmp13_;
-		PublishingGallery3PublishingParameters* _tmp14_;
-		const gchar* _tmp15_;
 #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = self->priv->new_album_entry;
+		_tmp5_ = self->priv->new_album_entry;
 #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = gtk_entry_get_text (_tmp8_);
+		_tmp6_ = gtk_entry_get_text (_tmp5_);
 #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp10_ = g_strdup (_tmp9_);
+		_tmp7_ = g_strdup (_tmp6_);
 #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (album_name);
 #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		album_name = _tmp10_;
+		album_name = _tmp7_;
 #line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = self->priv->host;
+		_tmp8_ = self->priv->host;
 #line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = album_name;
+		_tmp9_ = album_name;
 #line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp12_);
+		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp9_);
 #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp13_ = album_name;
+		_tmp10_ = album_name;
 #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp14_ = publishing_gallery3_publishing_parameters_new_to_new_album (_tmp13_);
+		_tmp11_ = publishing_gallery3_publishing_parameters_new_to_new_album (_tmp10_);
 #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_publishing_gallery3_publishing_parameters_unref0 (param);
 #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		param = _tmp14_;
+		param = _tmp11_;
 #line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp15_ = album_name;
+		_tmp12_ = album_name;
 #line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		g_debug ("GalleryConnector.vala:1577: Trying to publish to \"%s\"", _tmp15_);
-#line 9737 "GalleryConnector.c"
+		g_debug ("GalleryConnector.vala:1577: Trying to publish to \"%s\"", _tmp12_);
+#line 9803 "GalleryConnector.c"
 	} else {
-		PublishingGallery3Album** _tmp16_;
-		gint _tmp16__length1;
-		GtkComboBoxText* _tmp17_;
-		gint _tmp18_;
-		PublishingGallery3Album* _tmp19_;
+		PublishingGallery3Album** _tmp13_;
+		gint _tmp13__length1;
+		GtkComboBoxText* _tmp14_;
+		PublishingGallery3Album* _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
+		gchar* _tmp18_;
+		SpitPublishingPluginHost* _tmp19_;
 		const gchar* _tmp20_;
-		const gchar* _tmp21_;
-		gchar* _tmp22_;
-		SpitPublishingPluginHost* _tmp23_;
-		const gchar* _tmp24_;
 		gchar* album_path = NULL;
-		PublishingGallery3Album** _tmp25_;
-		gint _tmp25__length1;
-		GtkComboBoxText* _tmp26_;
-		gint _tmp27_;
-		PublishingGallery3Album* _tmp28_;
-		const gchar* _tmp29_;
-		const gchar* _tmp30_;
-		gchar* _tmp31_;
-		const gchar* _tmp32_;
-		PublishingGallery3PublishingParameters* _tmp33_;
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp16_ = self->priv->albums;
+		PublishingGallery3Album** _tmp21_;
+		gint _tmp21__length1;
+		GtkComboBoxText* _tmp22_;
+		PublishingGallery3Album* _tmp23_;
+		const gchar* _tmp24_;
+		const gchar* _tmp25_;
+		gchar* _tmp26_;
+		const gchar* _tmp27_;
+		PublishingGallery3PublishingParameters* _tmp28_;
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp16__length1 = self->priv->albums_length1;
+		_tmp13_ = self->priv->albums;
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp17_ = self->priv->existing_albums_combo;
+		_tmp13__length1 = self->priv->albums_length1;
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp19_ = _tmp16_[_tmp18_];
+		_tmp15_ = _tmp13_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp20_ = publishing_gallery3_album_get_title (_tmp19_);
+		_tmp16_ = publishing_gallery3_album_get_title (_tmp15_);
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp21_ = _tmp20_;
+		_tmp17_ = _tmp16_;
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp22_ = g_strdup (_tmp21_);
+		_tmp18_ = g_strdup (_tmp17_);
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (album_name);
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		album_name = _tmp22_;
+		album_name = _tmp18_;
 #line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp23_ = self->priv->host;
+		_tmp19_ = self->priv->host;
 #line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp24_ = album_name;
+		_tmp20_ = album_name;
 #line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp24_);
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp25_ = self->priv->albums;
+		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp20_);
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp25__length1 = self->priv->albums_length1;
+		_tmp21_ = self->priv->albums;
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp26_ = self->priv->existing_albums_combo;
+		_tmp21__length1 = self->priv->albums_length1;
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp27_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox));
+		_tmp22_ = self->priv->existing_albums_combo;
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp28_ = _tmp25_[_tmp27_];
+		_tmp23_ = _tmp21_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp29_ = publishing_gallery3_album_get_path (_tmp28_);
+		_tmp24_ = publishing_gallery3_album_get_path (_tmp23_);
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp30_ = _tmp29_;
+		_tmp25_ = _tmp24_;
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp31_ = g_strdup (_tmp30_);
+		_tmp26_ = g_strdup (_tmp25_);
 #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		album_path = _tmp31_;
+		album_path = _tmp26_;
 #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp32_ = album_path;
+		_tmp27_ = album_path;
 #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp33_ = publishing_gallery3_publishing_parameters_new_to_existing_album (_tmp32_);
+		_tmp28_ = publishing_gallery3_publishing_parameters_new_to_existing_album (_tmp27_);
 #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_publishing_gallery3_publishing_parameters_unref0 (param);
 #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		param = _tmp33_;
+		param = _tmp28_;
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (album_path);
-#line 9814 "GalleryConnector.c"
+#line 9874 "GalleryConnector.c"
 	}
 #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp34_ = param;
+	_tmp29_ = param;
 #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp35_ = photo_major_axis_size;
+	_tmp30_ = photo_major_axis_size;
 #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_publishing_parameters_set_photo_major_axis_size (_tmp34_, _tmp35_);
-#line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp36_ = param;
+	publishing_gallery3_publishing_parameters_set_photo_major_axis_size (_tmp29_, _tmp30_);
 #line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp37_ = self->priv->strip_metadata_check;
+	_tmp31_ = param;
 #line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp38_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp32_ = self->priv->strip_metadata_check;
 #line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_publishing_parameters_set_strip_metadata (_tmp36_, _tmp38_);
+	publishing_gallery3_publishing_parameters_set_strip_metadata (_tmp31_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_toggle_button_get_type (), GtkToggleButton)));
 #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp39_ = param;
+	_tmp33_ = param;
 #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp39_);
+	g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp33_);
 #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_gallery3_publishing_parameters_unref0 (param);
 #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (album_name);
-#line 9838 "GalleryConnector.c"
+#line 9896 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
 	GtkComboBoxText* _tmp0_;
 	GtkEntry* _tmp1_;
 	GtkComboBoxText* _tmp2_;
@@ -9899,11 +9959,13 @@ static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_cl
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9862 "GalleryConnector.c"
+#line 9922 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
 	GtkEntry* _tmp0_;
 	GtkComboBoxText* _tmp1_;
 	GtkEntry* _tmp2_;
@@ -9923,43 +9985,49 @@ static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clic
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9886 "GalleryConnector.c"
+#line 9948 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
 #line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 9895 "GalleryConnector.c"
+#line 9959 "GalleryConnector.c"
 }
 
 
-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 9918 "GalleryConnector.c"
+#line 9984 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self)
+{
 	gchar* album_name = NULL;
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
@@ -9969,7 +10037,7 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se
 	gchar* _tmp5_;
 	gchar* _tmp6_;
 	gboolean _tmp7_;
-	GtkButton* _tmp10_;
+	GtkButton* _tmp9_;
 #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9992,44 +10060,44 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se
 	_g_free0 (_tmp6_);
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp7_) {
-#line 9955 "GalleryConnector.c"
+#line 10023 "GalleryConnector.c"
 		GtkRadioButton* _tmp8_;
-		gboolean _tmp9_;
 #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp8_ = self->priv->create_new_radio;
 #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = _tmp9_;
-#line 9964 "GalleryConnector.c"
+		_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 10029 "GalleryConnector.c"
 	} else {
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = FALSE;
-#line 9968 "GalleryConnector.c"
+#line 10033 "GalleryConnector.c"
 	}
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = self->priv->publish_button;
+	_tmp9_ = self->priv->publish_button;
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
 #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (album_name);
-#line 9976 "GalleryConnector.c"
+#line 10041 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self)
+{
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9985 "GalleryConnector.c"
+#line 10052 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self)
+{
 	GtkEntry* _tmp0_;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
 #line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10037,191 +10105,140 @@ static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensi
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = self->priv->scaling_combo;
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp2_ == 1);
-#line 10003 "GalleryConnector.c"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) == 1);
+#line 10069 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self)
+{
 #line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self);
-#line 10012 "GalleryConnector.c"
+#line 10080 "GalleryConnector.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 10035 "GalleryConnector.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 10043 "GalleryConnector.c"
+#line 10104 "GalleryConnector.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 10055 "GalleryConnector.c"
+#line 10113 "GalleryConnector.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 10079 "GalleryConnector.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 10085 "GalleryConnector.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 10134 "GalleryConnector.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 10089 "GalleryConnector.c"
+#line 10138 "GalleryConnector.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 10093 "GalleryConnector.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = string_strnlen ((gchar*) self, offset + len);
+#line 10144 "GalleryConnector.c"
+	} else {
+		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 10154 "GalleryConnector.c"
+	}
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset < ((glong) 0)) {
+#line 10158 "GalleryConnector.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 10166 "GalleryConnector.c"
+	} else {
 		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 10173 "GalleryConnector.c"
+	}
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (len < ((glong) 0)) {
+#line 10177 "GalleryConnector.c"
 		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 10105 "GalleryConnector.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 10115 "GalleryConnector.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 10121 "GalleryConnector.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 10135 "GalleryConnector.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 10145 "GalleryConnector.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 10151 "GalleryConnector.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 10160 "GalleryConnector.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 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 10183 "GalleryConnector.c"
+	}
+#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 10180 "GalleryConnector.c"
+#line 10195 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self)
+{
 	gchar* orig_text = NULL;
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
@@ -10231,10 +10248,9 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi
 	const gchar* _tmp4_;
 	gint _tmp5_;
 	gint _tmp6_;
-	gchar _tmp7_;
-	const gchar* _tmp8_;
+	const gchar* _tmp7_;
+	gint _tmp8_;
 	gint _tmp9_;
-	gint _tmp10_;
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10254,62 +10270,59 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi
 #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp6_ = _tmp5_;
 #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = string_get (_tmp3_, (glong) (_tmp6_ - 1));
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	last_char = _tmp7_;
+	last_char = string_get (_tmp3_, (glong) (_tmp6_ - 1));
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = orig_text;
+	_tmp7_ = orig_text;
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = strlen (_tmp8_);
+	_tmp8_ = strlen (_tmp7_);
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp10_ > 0) {
-#line 10228 "GalleryConnector.c"
-		gchar _tmp11_;
-		gboolean _tmp12_;
+	if (_tmp9_ > 0) {
+#line 10242 "GalleryConnector.c"
+		gchar _tmp10_;
 #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp11_ = last_char;
+		_tmp10_ = last_char;
 #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp12_ = g_ascii_isdigit (_tmp11_);
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		if (!_tmp12_) {
-#line 10237 "GalleryConnector.c"
-			GtkEntry* _tmp13_;
-			const gchar* _tmp14_;
-			const gchar* _tmp15_;
-			gint _tmp16_;
-			gint _tmp17_;
-			gchar* _tmp18_;
-			gchar* _tmp19_;
+		if (!g_ascii_isdigit (_tmp10_)) {
+#line 10248 "GalleryConnector.c"
+			GtkEntry* _tmp11_;
+			const gchar* _tmp12_;
+			const gchar* _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
+			gchar* _tmp16_;
+			gchar* _tmp17_;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp13_ = self->priv->pixels;
+			_tmp11_ = self->priv->pixels;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp14_ = orig_text;
+			_tmp12_ = orig_text;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp15_ = orig_text;
+			_tmp13_ = orig_text;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp16_ = strlen (_tmp15_);
+			_tmp14_ = strlen (_tmp13_);
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp17_ = _tmp16_;
+			_tmp15_ = _tmp14_;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp18_ = string_substring (_tmp14_, (glong) 0, (glong) (_tmp17_ - 1));
+			_tmp16_ = string_substring (_tmp12_, (glong) 0, (glong) (_tmp15_ - 1));
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp19_ = _tmp18_;
+			_tmp17_ = _tmp16_;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			gtk_entry_set_text (_tmp13_, _tmp19_);
+			gtk_entry_set_text (_tmp11_, _tmp17_);
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_g_free0 (_tmp19_);
-#line 10263 "GalleryConnector.c"
+			_g_free0 (_tmp17_);
+#line 10274 "GalleryConnector.c"
 		}
 	}
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (orig_text);
-#line 10268 "GalleryConnector.c"
+#line 10279 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self) {
+void
+publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self)
+{
 	gint default_album_id = 0;
 	gchar* last_album = NULL;
 	SpitPublishingPluginHost* _tmp0_;
@@ -10326,19 +10339,19 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, "");
 #line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	last_album = _tmp1_;
-#line 10289 "GalleryConnector.c"
+#line 10302 "GalleryConnector.c"
 	{
 		gint i = 0;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = 0;
-#line 10294 "GalleryConnector.c"
+#line 10307 "GalleryConnector.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp2_ = TRUE;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			while (TRUE) {
-#line 10301 "GalleryConnector.c"
+#line 10314 "GalleryConnector.c"
 				gint _tmp4_;
 				PublishingGallery3Album** _tmp5_;
 				gint _tmp5__length1;
@@ -10359,13 +10372,13 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 				const gchar* _tmp18_;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp2_) {
-#line 10322 "GalleryConnector.c"
+#line 10335 "GalleryConnector.c"
 					gint _tmp3_;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp3_ = i;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					i = _tmp3_ + 1;
-#line 10328 "GalleryConnector.c"
+#line 10341 "GalleryConnector.c"
 				}
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp2_ = FALSE;
@@ -10379,7 +10392,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 				if (!(_tmp4_ <= (_tmp5__length1 - 1))) {
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					break;
-#line 10342 "GalleryConnector.c"
+#line 10355 "GalleryConnector.c"
 				}
 #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp6_ = self->priv->existing_albums_combo;
@@ -10415,7 +10428,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
 #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp12_ = TRUE;
-#line 10378 "GalleryConnector.c"
+#line 10391 "GalleryConnector.c"
 				} else {
 					gboolean _tmp19_ = FALSE;
 					PublishingGallery3Album** _tmp20_;
@@ -10438,31 +10451,31 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 					_tmp24_ = _tmp23_;
 #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					if (g_strcmp0 (PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME, _tmp24_) == 0) {
-#line 10401 "GalleryConnector.c"
+#line 10414 "GalleryConnector.c"
 						gint _tmp25_;
 #line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp25_ = default_album_id;
 #line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp19_ = -1 == _tmp25_;
-#line 10407 "GalleryConnector.c"
+#line 10420 "GalleryConnector.c"
 					} else {
 #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp19_ = FALSE;
-#line 10411 "GalleryConnector.c"
+#line 10424 "GalleryConnector.c"
 					}
 #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp12_ = _tmp19_;
-#line 10415 "GalleryConnector.c"
+#line 10428 "GalleryConnector.c"
 				}
 #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (_tmp12_) {
-#line 10419 "GalleryConnector.c"
+#line 10432 "GalleryConnector.c"
 					gint _tmp26_;
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp26_ = i;
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					default_album_id = _tmp26_;
-#line 10425 "GalleryConnector.c"
+#line 10438 "GalleryConnector.c"
 				}
 			}
 		}
@@ -10473,7 +10486,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 	_tmp27__length1 = self->priv->albums_length1;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp27__length1 == 0) {
-#line 10436 "GalleryConnector.c"
+#line 10449 "GalleryConnector.c"
 		GtkComboBoxText* _tmp28_;
 		GtkRadioButton* _tmp29_;
 		GtkRadioButton* _tmp30_;
@@ -10499,14 +10512,14 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 		_tmp32_ = self->priv->new_album_entry;
 #line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		gtk_entry_set_text (_tmp32_, PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME);
-#line 10462 "GalleryConnector.c"
+#line 10475 "GalleryConnector.c"
 	} else {
 		gint _tmp33_;
 #line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp33_ = default_album_id;
 #line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (_tmp33_ >= 0) {
-#line 10469 "GalleryConnector.c"
+#line 10482 "GalleryConnector.c"
 			GtkRadioButton* _tmp34_;
 			GtkComboBoxText* _tmp35_;
 			gint _tmp36_;
@@ -10525,7 +10538,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 			_tmp37_ = self->priv->new_album_entry;
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10488 "GalleryConnector.c"
+#line 10501 "GalleryConnector.c"
 		} else {
 			GtkRadioButton* _tmp38_;
 			GtkComboBoxText* _tmp39_;
@@ -10547,7 +10560,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 			_tmp41_ = self->priv->new_album_entry;
 #line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
-#line 10510 "GalleryConnector.c"
+#line 10523 "GalleryConnector.c"
 		}
 	}
 #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10556,11 +10569,13 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
 	publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self);
 #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (last_album);
-#line 10519 "GalleryConnector.c"
+#line 10532 "GalleryConnector.c"
 }
 
 
-static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3PublishingOptionsPane * self;
 	GtkWidget* result = NULL;
 	GtkGrid* _tmp0_;
@@ -10575,11 +10590,13 @@ static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (S
 	result = _tmp1_;
 #line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10538 "GalleryConnector.c"
+#line 10553 "GalleryConnector.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3PublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10588,29 +10605,40 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_op
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10551 "GalleryConnector.c"
+#line 10568 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3PublishingOptionsPane * self;
 #line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane);
 #line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_installed (self);
-#line 10561 "GalleryConnector.c"
+#line 10580 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3PublishingOptionsPane * self;
 #line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane);
-#line 10569 "GalleryConnector.c"
+#line 10590 "GalleryConnector.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (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_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure,
+                                                                         GValue * return_value,
+                                                                         guint n_param_values,
+                                                                         const GValue * param_values,
+                                                                         gpointer invocation_hint,
+                                                                         gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS) (gpointer data1, gpointer arg_1, gpointer data2);
 	register GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS callback;
 	register GCClosure * cc;
@@ -10625,23 +10653,25 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMET
 		data1 = closure->data;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10588 "GalleryConnector.c"
+#line 10616 "GalleryConnector.c"
 	} else {
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		data2 = closure->data;
-#line 10594 "GalleryConnector.c"
+#line 10622 "GalleryConnector.c"
 	}
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	callback = (GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback);
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	callback (data1, publishing_gallery3_value_get_publishing_parameters (param_values + 1), data2);
-#line 10600 "GalleryConnector.c"
+#line 10628 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_class_init (PublishingGallery3PublishingOptionsPaneClass * klass) {
+static void
+publishing_gallery3_publishing_options_pane_class_init (PublishingGallery3PublishingOptionsPaneClass * klass)
+{
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10652,11 +10682,13 @@ static void publishing_gallery3_publishing_options_pane_class_init (PublishingGa
 	publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS);
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 10615 "GalleryConnector.c"
+#line 10645 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10667,11 +10699,13 @@ static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_p
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_installed;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled;
-#line 10630 "GalleryConnector.c"
+#line 10662 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_instance_init (PublishingGallery3PublishingOptionsPane * self) {
+static void
+publishing_gallery3_publishing_options_pane_instance_init (PublishingGallery3PublishingOptionsPane * self)
+{
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
 #line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10698,11 +10732,13 @@ static void publishing_gallery3_publishing_options_pane_instance_init (Publishin
 	self->priv->publish_button = NULL;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->logout_button = NULL;
-#line 10661 "GalleryConnector.c"
+#line 10695 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_gallery3_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingGallery3PublishingOptionsPane * self;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane);
@@ -10734,11 +10770,13 @@ static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj)
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (publishing_gallery3_publishing_options_pane_parent_class)->finalize (obj);
-#line 10697 "GalleryConnector.c"
+#line 10733 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_publishing_options_pane_get_type (void) {
+GType
+publishing_gallery3_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_gallery3_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3PublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3PublishingOptionsPane), 0, (GInstanceInitFunc) publishing_gallery3_publishing_options_pane_instance_init, NULL };
@@ -10752,116 +10790,121 @@ GType publishing_gallery3_publishing_options_pane_get_type (void) {
 }
 
 
-static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct (GType object_type) {
+static PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_construct (GType object_type)
+{
 	PublishingGallery3PublishingParameters* self = NULL;
 #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type);
 #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 10721 "GalleryConnector.c"
+#line 10761 "GalleryConnector.c"
 }
 
 
-static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void) {
+static PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_new (void)
+{
 #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_publishing_parameters_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS);
-#line 10728 "GalleryConnector.c"
+#line 10770 "GalleryConnector.c"
 }
 
 
-static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) {
+static gchar*
+string_delimit (const gchar* self,
+                const gchar* delimiters,
+                gchar new_delimiter)
+{
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_;
 	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar _tmp3_;
-#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = delimiters;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = new_delimiter;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_strdelimit (_tmp1_, delimiters, new_delimiter);
+#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 10759 "GalleryConnector.c"
+#line 10799 "GalleryConnector.c"
 }
 
 
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type,
+                                                                  const gchar* album_title)
+{
 	PublishingGallery3PublishingParameters* self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
 #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (album_title != NULL, NULL);
 #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type);
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = album_title;
-#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = string_delimit (_tmp0_, " ", '-');
+	_tmp0_ = string_delimit (album_title, " ", '-');
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_publishing_parameters_set_album_name (self, _tmp2_);
+	publishing_gallery3_publishing_parameters_set_album_name (self, _tmp1_);
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp2_);
-#line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = album_title;
+	_g_free0 (_tmp1_);
 #line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_publishing_parameters_set_album_title (self, _tmp3_);
+	publishing_gallery3_publishing_parameters_set_album_title (self, album_title);
 #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 10789 "GalleryConnector.c"
+#line 10826 "GalleryConnector.c"
 }
 
 
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title)
+{
 #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_publishing_parameters_construct_to_new_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_title);
-#line 10796 "GalleryConnector.c"
+#line 10835 "GalleryConnector.c"
 }
 
 
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type,
+                                                                       const gchar* album_path)
+{
 	PublishingGallery3PublishingParameters* self = NULL;
-	const gchar* _tmp0_;
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (album_path != NULL, NULL);
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = album_path;
-#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_publishing_parameters_set_album_path (self, _tmp0_);
+	publishing_gallery3_publishing_parameters_set_album_path (self, album_path);
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 10813 "GalleryConnector.c"
+#line 10852 "GalleryConnector.c"
 }
 
 
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path)
+{
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_publishing_parameters_construct_to_existing_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_path);
-#line 10820 "GalleryConnector.c"
+#line 10861 "GalleryConnector.c"
 }
 
 
-gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self) {
+gboolean
+publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self)
+{
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
 #line 1723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10872,48 +10915,49 @@ gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGa
 	result = g_strcmp0 (_tmp0_, "") != 0;
 #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10835 "GalleryConnector.c"
+#line 10878 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self)
+{
 	const gchar* result;
-	gboolean _tmp0_;
-	const gchar* _tmp1_;
+	const gchar* _tmp0_;
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = publishing_gallery3_publishing_parameters_is_to_new_album (self);
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_vala_assert (_tmp0_, "is_to_new_album()");
+	_vala_assert (publishing_gallery3_publishing_parameters_is_to_new_album (self), "is_to_new_album()");
 #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = self->priv->_album_title;
+	_tmp0_ = self->priv->_album_title;
 #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10855 "GalleryConnector.c"
+#line 10897 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self,
+                                                           const gchar* value)
+{
+	gchar* _tmp0_;
 #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
 #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_album_title);
 #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_album_title = _tmp1_;
-#line 10872 "GalleryConnector.c"
+	self->priv->_album_title = _tmp0_;
+#line 10914 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10924,28 +10968,30 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_name (Publishin
 	result = _tmp0_;
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10887 "GalleryConnector.c"
+#line 10931 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self,
+                                                          const gchar* value)
+{
+	gchar* _tmp0_;
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_album_name);
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_album_name = _tmp1_;
-#line 10904 "GalleryConnector.c"
+	self->priv->_album_name = _tmp0_;
+#line 10948 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10956,28 +11002,30 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_path (Publishin
 	result = _tmp0_;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10919 "GalleryConnector.c"
+#line 10965 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self,
+                                                          const gchar* value)
+{
+	gchar* _tmp0_;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_album_path);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_album_path = _tmp1_;
-#line 10936 "GalleryConnector.c"
+	self->priv->_album_path = _tmp0_;
+#line 10982 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10988,28 +11036,30 @@ const gchar* publishing_gallery3_publishing_parameters_get_entity_title (Publish
 	result = _tmp0_;
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10951 "GalleryConnector.c"
+#line 10999 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self,
+                                                            const gchar* value)
+{
+	gchar* _tmp0_;
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_entity_title);
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_entity_title = _tmp1_;
-#line 10968 "GalleryConnector.c"
+	self->priv->_entity_title = _tmp0_;
+#line 11016 "GalleryConnector.c"
 }
 
 
-gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self) {
+gint
+publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self)
+{
 	gint result;
 	gint _tmp0_;
 #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11020,23 +11070,25 @@ gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (Publis
 	result = _tmp0_;
 #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10983 "GalleryConnector.c"
+#line 11033 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value) {
-	gint _tmp0_;
+void
+publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self,
+                                                                     gint value)
+{
 #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
 #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_photo_major_axis_size = _tmp0_;
-#line 10995 "GalleryConnector.c"
+	self->priv->_photo_major_axis_size = value;
+#line 11045 "GalleryConnector.c"
 }
 
 
-gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self) {
+gboolean
+publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11047,120 +11099,145 @@ gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (Publishin
 	result = _tmp0_;
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 11010 "GalleryConnector.c"
+#line 11062 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value) {
-	gboolean _tmp0_;
+void
+publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self,
+                                                              gboolean value)
+{
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_strip_metadata = _tmp0_;
-#line 11022 "GalleryConnector.c"
+	self->priv->_strip_metadata = value;
+#line 11074 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_gallery3_value_publishing_parameters_init (GValue* value)
+{
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	value->data[0].v_pointer = NULL;
-#line 11029 "GalleryConnector.c"
+#line 11083 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_gallery3_value_publishing_parameters_free_value (GValue* value)
+{
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (value->data[0].v_pointer) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_publishing_parameters_unref (value->data[0].v_pointer);
-#line 11038 "GalleryConnector.c"
+#line 11094 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_gallery3_value_publishing_parameters_copy_value (const GValue* src_value,
+                                                            GValue* dest_value)
+{
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (src_value->data[0].v_pointer) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		dest_value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 11048 "GalleryConnector.c"
+#line 11107 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11052 "GalleryConnector.c"
+#line 11111 "GalleryConnector.c"
 	}
 }
 
 
-static gpointer publishing_gallery3_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_gallery3_value_publishing_parameters_peek_pointer (const GValue* value)
+{
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return value->data[0].v_pointer;
-#line 11060 "GalleryConnector.c"
+#line 11121 "GalleryConnector.c"
 }
 
 
-static gchar* publishing_gallery3_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_publishing_parameters_collect_value (GValue* value,
+                                                               guint n_collect_values,
+                                                               GTypeCValue* collect_values,
+                                                               guint collect_flags)
+{
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (collect_values[0].v_pointer) {
-#line 11067 "GalleryConnector.c"
+#line 11133 "GalleryConnector.c"
 		PublishingGallery3PublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11074 "GalleryConnector.c"
+#line 11140 "GalleryConnector.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 11078 "GalleryConnector.c"
+#line 11144 "GalleryConnector.c"
 		}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (object);
-#line 11082 "GalleryConnector.c"
+#line 11148 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 11086 "GalleryConnector.c"
+#line 11152 "GalleryConnector.c"
 	}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 11090 "GalleryConnector.c"
+#line 11156 "GalleryConnector.c"
 }
 
 
-static gchar* publishing_gallery3_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_publishing_parameters_lcopy_value (const GValue* value,
+                                                             guint n_collect_values,
+                                                             GTypeCValue* collect_values,
+                                                             guint collect_flags)
+{
 	PublishingGallery3PublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (!object_p) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11101 "GalleryConnector.c"
+#line 11172 "GalleryConnector.c"
 	}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (!value->data[0].v_pointer) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*object_p = NULL;
-#line 11107 "GalleryConnector.c"
+#line 11178 "GalleryConnector.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11111 "GalleryConnector.c"
+#line 11182 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*object_p = publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer);
-#line 11115 "GalleryConnector.c"
+#line 11186 "GalleryConnector.c"
 	}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 11119 "GalleryConnector.c"
+#line 11190 "GalleryConnector.c"
 }
 
 
-GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_gallery3_param_spec_publishing_parameters (const gchar* name,
+                                                      const gchar* nick,
+                                                      const gchar* blurb,
+                                                      GType object_type,
+                                                      GParamFlags flags)
+{
 	PublishingGallery3ParamSpecPublishingParameters* spec;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -11170,20 +11247,25 @@ GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return G_PARAM_SPEC (spec);
-#line 11133 "GalleryConnector.c"
+#line 11210 "GalleryConnector.c"
 }
 
 
-gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_gallery3_value_get_publishing_parameters (const GValue* value)
+{
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return value->data[0].v_pointer;
-#line 11142 "GalleryConnector.c"
+#line 11221 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_set_publishing_parameters (GValue* value,
+                                                     gpointer v_object)
+{
 	PublishingGallery3PublishingParameters * old;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS));
@@ -11199,22 +11281,25 @@ void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointe
 		value->data[0].v_pointer = v_object;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer);
-#line 11162 "GalleryConnector.c"
+#line 11244 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 11166 "GalleryConnector.c"
+#line 11248 "GalleryConnector.c"
 	}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (old) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_publishing_parameters_unref (old);
-#line 11172 "GalleryConnector.c"
+#line 11254 "GalleryConnector.c"
 	}
 }
 
 
-void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_take_publishing_parameters (GValue* value,
+                                                      gpointer v_object)
+{
 	PublishingGallery3PublishingParameters * old;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS));
@@ -11228,33 +11313,37 @@ void publishing_gallery3_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 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = v_object;
-#line 11191 "GalleryConnector.c"
+#line 11276 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 11195 "GalleryConnector.c"
+#line 11280 "GalleryConnector.c"
 	}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (old) {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_publishing_parameters_unref (old);
-#line 11201 "GalleryConnector.c"
+#line 11286 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_publishing_parameters_class_init (PublishingGallery3PublishingParametersClass * klass) {
+static void
+publishing_gallery3_publishing_parameters_class_init (PublishingGallery3PublishingParametersClass * klass)
+{
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingGallery3PublishingParametersClass *) klass)->finalize = publishing_gallery3_publishing_parameters_finalize;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_type_class_add_private (klass, sizeof (PublishingGallery3PublishingParametersPrivate));
-#line 11213 "GalleryConnector.c"
+#line 11300 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self) {
+static void
+publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
@@ -11283,11 +11372,13 @@ static void publishing_gallery3_publishing_parameters_instance_init (PublishingG
 	self->priv->_strip_metadata = FALSE;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->ref_count = 1;
-#line 11246 "GalleryConnector.c"
+#line 11335 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj) {
+static void
+publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj)
+{
 	PublishingGallery3PublishingParameters * self;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParameters);
@@ -11301,11 +11392,13 @@ static void publishing_gallery3_publishing_parameters_finalize (PublishingGaller
 	_g_free0 (self->priv->_album_path);
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_entity_title);
-#line 11264 "GalleryConnector.c"
+#line 11355 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_publishing_parameters_get_type (void) {
+GType
+publishing_gallery3_publishing_parameters_get_type (void)
+{
 	static volatile gsize publishing_gallery3_publishing_parameters_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_publishing_parameters_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_gallery3_value_publishing_parameters_init, publishing_gallery3_value_publishing_parameters_free_value, publishing_gallery3_value_publishing_parameters_copy_value, publishing_gallery3_value_publishing_parameters_peek_pointer, "p", publishing_gallery3_value_publishing_parameters_collect_value, "p", publishing_gallery3_value_publishing_parameters_lcopy_value };
@@ -11319,18 +11412,22 @@ GType publishing_gallery3_publishing_parameters_get_type (void) {
 }
 
 
-gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_gallery3_publishing_parameters_ref (gpointer instance)
+{
 	PublishingGallery3PublishingParameters * self;
 	self = instance;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return instance;
-#line 11289 "GalleryConnector.c"
+#line 11384 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_publishing_parameters_unref (gpointer instance) {
+void
+publishing_gallery3_publishing_parameters_unref (gpointer instance)
+{
 	PublishingGallery3PublishingParameters * self;
 	self = instance;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11339,18 +11436,20 @@ void publishing_gallery3_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11302 "GalleryConnector.c"
+#line 11399 "GalleryConnector.c"
 	}
 }
 
 
-gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self) {
+gchar*
+publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self)
+{
 	gchar* result = NULL;
 #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	switch (self) {
 #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO:
-#line 11313 "GalleryConnector.c"
+#line 11412 "GalleryConnector.c"
 		{
 			gchar* _tmp0_;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11359,11 +11458,11 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr
 			result = _tmp0_;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return result;
-#line 11322 "GalleryConnector.c"
+#line 11421 "GalleryConnector.c"
 		}
 #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY:
-#line 11326 "GalleryConnector.c"
+#line 11425 "GalleryConnector.c"
 		{
 			gchar* _tmp1_;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11372,11 +11471,11 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr
 			result = _tmp1_;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return result;
-#line 11335 "GalleryConnector.c"
+#line 11434 "GalleryConnector.c"
 		}
 #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL:
-#line 11339 "GalleryConnector.c"
+#line 11438 "GalleryConnector.c"
 		{
 			gchar* _tmp2_;
 #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11385,20 +11484,22 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr
 			result = _tmp2_;
 #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return result;
-#line 11348 "GalleryConnector.c"
+#line 11447 "GalleryConnector.c"
 		}
 		default:
 		{
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			g_error ("GalleryConnector.vala:1746: unrecognized CredentialsPane.Mode enumerat" \
 "ion value");
-#line 11354 "GalleryConnector.c"
+#line 11453 "GalleryConnector.c"
 		}
 	}
 }
 
 
-GType publishing_gallery3_credentials_pane_mode_get_type (void) {
+GType
+publishing_gallery3_credentials_pane_mode_get_type (void)
+{
 	static volatile gsize publishing_gallery3_credentials_pane_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_credentials_pane_mode_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO", "intro"}, {PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY", "failed-retry"}, {PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL", "not-gallery-url"}, {0, NULL, NULL}};
@@ -11410,21 +11511,23 @@ GType publishing_gallery3_credentials_pane_mode_get_type (void) {
 }
 
 
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) {
+PublishingGallery3CredentialsPane*
+publishing_gallery3_credentials_pane_construct (GType object_type,
+                                                SpitPublishingPluginHost* host,
+                                                PublishingGallery3CredentialsPaneMode mode,
+                                                const gchar* url,
+                                                const gchar* username,
+                                                const gchar* key)
+{
 	PublishingGallery3CredentialsPane * self = NULL;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_;
-	SpitPublishingPluginHost* _tmp9_;
-	PublishingGallery3CredentialsPaneMode _tmp10_;
-	const gchar* _tmp11_;
-	const gchar* _tmp12_;
-	const gchar* _tmp13_;
-	GtkBuilder* _tmp14_;
-	PublishingGallery3CredentialsGrid* _tmp15_;
-	PublishingGallery3CredentialsGrid* _tmp16_;
-	GtkGrid* _tmp17_;
-	GtkGrid* _tmp18_;
-	GtkWidget* _tmp19_;
+	GtkBuilder* _tmp8_;
+	PublishingGallery3CredentialsGrid* _tmp9_;
+	PublishingGallery3CredentialsGrid* _tmp10_;
+	GtkGrid* _tmp11_;
+	GtkGrid* _tmp12_;
+	GtkWidget* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
@@ -11434,7 +11537,7 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 	_tmp0_ = gtk_builder_new ();
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	builder = _tmp0_;
-#line 11396 "GalleryConnector.c"
+#line 11499 "GalleryConnector.c"
 	{
 		GtkBuilder* _tmp1_;
 #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11443,7 +11546,7 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_authentication_pane.ui", &_inner_error_);
 #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11405 "GalleryConnector.c"
+#line 11508 "GalleryConnector.c"
 			goto __catch15_g_error;
 		}
 	}
@@ -11453,11 +11556,10 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 		GError* e = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
-		SpitPublishingPluginHost* _tmp4_;
+		gchar* _tmp4_;
 		gchar* _tmp5_;
-		gchar* _tmp6_;
+		GError* _tmp6_;
 		GError* _tmp7_;
-		GError* _tmp8_;
 #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		e = _inner_error_;
 #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11469,29 +11571,27 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 #line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_warning ("GalleryConnector.vala:1770: Could not parse UI file! Error: %s.", _tmp3_);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp4_ = host;
-#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \
+		_tmp4_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \
 "continue."), PUBLISHING_GALLERY3_SERVICE_NAME);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
+		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_);
+		spit_publishing_plugin_host_post_error (host, _tmp7_);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_error_free0 (_tmp8_);
+		_g_error_free0 (_tmp7_);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_free0 (_tmp6_);
+		_g_free0 (_tmp5_);
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (e);
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_object_unref0 (builder);
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return self;
-#line 11452 "GalleryConnector.c"
+#line 11552 "GalleryConnector.c"
 	}
 	__finally15:
 #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11504,67 +11604,67 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 		g_clear_error (&_inner_error_);
 #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return NULL;
-#line 11465 "GalleryConnector.c"
+#line 11565 "GalleryConnector.c"
 	}
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = host;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = mode;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = url;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = username;
+	_tmp8_ = builder;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = key;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = builder;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = publishing_gallery3_credentials_grid_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
+	_tmp9_ = publishing_gallery3_credentials_grid_new (host, mode, url, username, key, _tmp8_);
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->frame);
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->frame = _tmp15_;
+	self->priv->frame = _tmp9_;
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = self->priv->frame;
+	_tmp10_ = self->priv->frame;
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp16_);
+	_tmp11_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp10_);
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = _tmp17_;
+	_tmp12_ = _tmp11_;
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp18_) : NULL);
+	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp12_) : NULL);
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->grid_widget);
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->grid_widget = _tmp19_;
+	self->priv->grid_widget = _tmp13_;
 #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (builder);
 #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 11501 "GalleryConnector.c"
+#line 11591 "GalleryConnector.c"
 }
 
 
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) {
+PublishingGallery3CredentialsPane*
+publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host,
+                                          PublishingGallery3CredentialsPaneMode mode,
+                                          const gchar* url,
+                                          const gchar* username,
+                                          const gchar* key)
+{
 #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_credentials_pane_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, host, mode, url, username, key);
-#line 11508 "GalleryConnector.c"
+#line 11604 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self) {
+void
+publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self)
+{
 #line 1785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self));
 #line 1786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL], 0);
-#line 11517 "GalleryConnector.c"
+#line 11615 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, const gchar* url, const gchar* uname, const gchar* password, const gchar* key) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
+void
+publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self,
+                                                   const gchar* url,
+                                                   const gchar* uname,
+                                                   const gchar* password,
+                                                   const gchar* key)
+{
 #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self));
 #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11576,20 +11676,14 @@ void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3Creden
 #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (key != NULL);
 #line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = url;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = uname;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = password;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = key;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 11546 "GalleryConnector.c"
+	g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, url, uname, password, key);
+#line 11638 "GalleryConnector.c"
 }
 
 
-static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3CredentialsPane * self;
 	GtkWidget* result = NULL;
 	GtkWidget* _tmp0_;
@@ -11609,11 +11703,13 @@ static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPubl
 	result = _tmp2_;
 #line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 11570 "GalleryConnector.c"
+#line 11664 "GalleryConnector.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3CredentialsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11622,25 +11718,37 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_p
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 11583 "GalleryConnector.c"
+#line 11679 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender,
+                                                                                                   gpointer self)
+{
 #line 1804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_pane_notify_go_back ((PublishingGallery3CredentialsPane*) self);
-#line 11590 "GalleryConnector.c"
+#line 11689 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender, const gchar* url, const gchar* username, const gchar* password, const gchar* key, gpointer self) {
+static void
+_publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender,
+                                                                                               const gchar* url,
+                                                                                               const gchar* username,
+                                                                                               const gchar* password,
+                                                                                               const gchar* key,
+                                                                                               gpointer self)
+{
 #line 1805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_pane_notify_login ((PublishingGallery3CredentialsPane*) self, url, username, password, key);
-#line 11597 "GalleryConnector.c"
+#line 11703 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3CredentialsPane * self;
 	PublishingGallery3CredentialsGrid* _tmp0_;
 	PublishingGallery3CredentialsGrid* _tmp1_;
@@ -11659,11 +11767,13 @@ static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPub
 	_tmp2_ = self->priv->frame;
 #line 1807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_installed (_tmp2_);
-#line 11620 "GalleryConnector.c"
+#line 11728 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingGallery3CredentialsPane * self;
 	PublishingGallery3CredentialsGrid* _tmp0_;
 	guint _tmp1_;
@@ -11683,11 +11793,18 @@ static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitP
 	g_signal_parse_name ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, &_tmp3_, NULL, FALSE);
 #line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login, self);
-#line 11644 "GalleryConnector.c"
+#line 11754 "GalleryConnector.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure,
+                                                           GValue * return_value,
+                                                           guint n_param_values,
+                                                           const GValue * param_values,
+                                                           gpointer invocation_hint,
+                                                           gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, const char* arg_3, const char* arg_4, gpointer data2);
 	register GMarshalFunc_VOID__STRING_STRING_STRING_STRING callback;
 	register GCClosure * cc;
@@ -11702,23 +11819,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure
 		data1 = closure->data;
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 11663 "GalleryConnector.c"
+#line 11780 "GalleryConnector.c"
 	} else {
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		data2 = closure->data;
-#line 11669 "GalleryConnector.c"
+#line 11786 "GalleryConnector.c"
 	}
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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_string (param_values + 4), data2);
-#line 11675 "GalleryConnector.c"
+#line 11792 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3CredentialsPaneClass * klass) {
+static void
+publishing_gallery3_credentials_pane_class_init (PublishingGallery3CredentialsPaneClass * klass)
+{
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_pane_parent_class = g_type_class_peek_parent (klass);
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11729,11 +11848,13 @@ static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3C
 	publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-#line 11690 "GalleryConnector.c"
+#line 11809 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11744,22 +11865,26 @@ static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_int
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_installed;
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_uninstalled;
-#line 11705 "GalleryConnector.c"
+#line 11826 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_pane_instance_init (PublishingGallery3CredentialsPane * self) {
+static void
+publishing_gallery3_credentials_pane_instance_init (PublishingGallery3CredentialsPane * self)
+{
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_CREDENTIALS_PANE_GET_PRIVATE (self);
 #line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->frame = NULL;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->grid_widget = NULL;
-#line 11716 "GalleryConnector.c"
+#line 11839 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_pane_finalize (GObject * obj) {
+static void
+publishing_gallery3_credentials_pane_finalize (GObject * obj)
+{
 	PublishingGallery3CredentialsPane * self;
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane);
@@ -11769,11 +11894,13 @@ static void publishing_gallery3_credentials_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->grid_widget);
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (publishing_gallery3_credentials_pane_parent_class)->finalize (obj);
-#line 11730 "GalleryConnector.c"
+#line 11855 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_credentials_pane_get_type (void) {
+GType
+publishing_gallery3_credentials_pane_get_type (void)
+{
 	static volatile gsize publishing_gallery3_credentials_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_credentials_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3CredentialsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_credentials_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3CredentialsPane), 0, (GInstanceInitFunc) publishing_gallery3_credentials_pane_instance_init, NULL };
@@ -11787,78 +11914,74 @@ GType publishing_gallery3_credentials_pane_get_type (void) {
 }
 
 
-static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                       gpointer self)
+{
 #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_on_url_or_username_changed ((PublishingGallery3CredentialsGrid*) self);
-#line 11751 "GalleryConnector.c"
+#line 11881 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                    gpointer self)
+{
 #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_on_go_back_button_clicked ((PublishingGallery3CredentialsGrid*) self);
-#line 11758 "GalleryConnector.c"
+#line 11891 "GalleryConnector.c"
 }
 
 
-static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                  gpointer self)
+{
 #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_on_login_button_clicked ((PublishingGallery3CredentialsGrid*) self);
-#line 11765 "GalleryConnector.c"
+#line 11901 "GalleryConnector.c"
 }
 
 
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) {
+PublishingGallery3CredentialsGrid*
+publishing_gallery3_credentials_grid_construct (GType object_type,
+                                                SpitPublishingPluginHost* host,
+                                                PublishingGallery3CredentialsPaneMode mode,
+                                                const gchar* url,
+                                                const gchar* username,
+                                                const gchar* key,
+                                                GtkBuilder* builder)
+{
 	PublishingGallery3CredentialsGrid * self = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	GtkBuilder* _tmp7_;
-	GtkBuilder* _tmp8_;
-	GtkBuilder* _tmp9_;
-	GtkBuilder* _tmp10_;
-	GSList* _tmp11_;
-	GSList* _tmp12_;
-	guint _tmp13_;
-	GtkBuilder* _tmp14_;
+	GtkBuilder* _tmp3_;
+	GSList* _tmp4_;
+	GSList* _tmp5_;
+	GObject* _tmp6_;
+	GObject* _tmp7_;
+	GtkLabel* _tmp8_;
+	GObject* _tmp9_;
+	GtkEntry* _tmp10_;
+	GObject* _tmp11_;
+	GtkEntry* _tmp12_;
+	GObject* _tmp13_;
+	GtkEntry* _tmp14_;
 	GObject* _tmp15_;
-	GtkBuilder* _tmp16_;
+	GtkEntry* _tmp16_;
 	GObject* _tmp17_;
-	GtkLabel* _tmp18_;
-	GtkBuilder* _tmp19_;
-	GObject* _tmp20_;
-	GtkEntry* _tmp21_;
-	GtkBuilder* _tmp22_;
-	GObject* _tmp23_;
-	GtkEntry* _tmp24_;
-	GtkBuilder* _tmp25_;
-	GObject* _tmp26_;
-	GtkEntry* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_;
+	GtkButton* _tmp18_;
+	GObject* _tmp19_;
+	GtkButton* _tmp20_;
 	GtkEntry* _tmp30_;
-	GtkBuilder* _tmp31_;
-	GObject* _tmp32_;
-	GtkButton* _tmp33_;
-	GtkBuilder* _tmp34_;
-	GObject* _tmp35_;
-	GtkButton* _tmp36_;
-	PublishingGallery3CredentialsPaneMode _tmp37_;
-	const gchar* _tmp45_;
-	GtkEntry* _tmp49_;
-	const gchar* _tmp50_;
-	GtkEntry* _tmp54_;
-	const gchar* _tmp55_;
-	GtkEntry* _tmp59_;
-	GtkButton* _tmp60_;
-	GtkButton* _tmp61_;
-	gboolean _tmp62_ = FALSE;
-	const gchar* _tmp63_;
-	GtkButton* _tmp65_;
+	GtkEntry* _tmp33_;
+	GtkEntry* _tmp36_;
+	GtkButton* _tmp37_;
+	GtkButton* _tmp38_;
+	gboolean _tmp39_ = FALSE;
+	GtkButton* _tmp40_;
 #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11866,313 +11989,267 @@ PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construc
 #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3CredentialsGrid*) g_object_new (object_type, NULL);
 #line 1845 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = host;
-#line 1845 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->host = _tmp0_;
-#line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = url;
+	self->priv->host = host;
 #line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp0_ = g_strdup (url);
 #line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->url);
 #line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->url = _tmp2_;
+	self->priv->url = _tmp0_;
 #line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = key;
-#line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp1_ = g_strdup (key);
 #line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->key);
 #line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->key = _tmp4_;
+	self->priv->key = _tmp1_;
 #line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = username;
-#line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp2_ = g_strdup (username);
 #line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->username);
 #line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->username = _tmp6_;
-#line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = builder;
+	self->priv->username = _tmp2_;
 #line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = _g_object_ref0 (_tmp7_);
+	_tmp3_ = _g_object_ref0 (builder);
 #line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->builder);
 #line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->builder = _tmp8_;
-#line 1851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp9_ = builder;
+	self->priv->builder = _tmp3_;
 #line 1851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_vala_assert (_tmp9_ != NULL, "builder != null");
-#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = builder;
-#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = gtk_builder_get_objects (_tmp10_);
+	_vala_assert (builder != NULL, "builder != null");
 #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = _tmp11_;
+	_tmp4_ = gtk_builder_get_objects (builder);
 #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = g_slist_length (_tmp12_);
+	_tmp5_ = _tmp4_;
 #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_vala_assert (_tmp13_ > ((guint) 0), "builder.get_objects().length() > 0");
+	_vala_assert (g_slist_length (_tmp5_) > ((guint) 0), "builder.get_objects().length() > 0");
 #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_slist_free0 (_tmp12_);
-#line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = builder;
+	_g_slist_free0 (_tmp5_);
 #line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = gtk_builder_get_object (_tmp14_, "gallery3_auth_pane_widget");
+	_tmp6_ = gtk_builder_get_object (builder, "gallery3_auth_pane_widget");
 #line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_credentials_grid_set_pane_widget (self, G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp15_) : NULL);
-#line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = builder;
+	publishing_gallery3_credentials_grid_set_pane_widget (self, G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp6_) : NULL);
 #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "intro_message_label");
+	_tmp7_ = gtk_builder_get_object (builder, "intro_message_label");
 #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp17_) : NULL);
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp7_) : NULL);
 #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->intro_message_label);
 #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->intro_message_label = _tmp18_;
+	self->priv->intro_message_label = _tmp8_;
 #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = builder;
+	_tmp9_ = gtk_builder_get_object (builder, "url_entry");
 #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "url_entry");
-#line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp20_) : NULL);
+	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp9_) : NULL);
 #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->url_entry);
 #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->url_entry = _tmp21_;
-#line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp22_ = builder;
+	self->priv->url_entry = _tmp10_;
 #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp23_ = gtk_builder_get_object (_tmp22_, "username_entry");
+	_tmp11_ = gtk_builder_get_object (builder, "username_entry");
 #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp23_) : NULL);
+	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp11_) : NULL);
 #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->username_entry);
 #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->username_entry = _tmp24_;
+	self->priv->username_entry = _tmp12_;
 #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp25_ = builder;
+	_tmp13_ = gtk_builder_get_object (builder, "key_entry");
 #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "key_entry");
-#line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
+	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL);
 #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->key_entry);
 #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->key_entry = _tmp27_;
-#line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp28_ = builder;
+	self->priv->key_entry = _tmp14_;
 #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "password_entry");
+	_tmp15_ = gtk_builder_get_object (builder, "password_entry");
 #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp29_) : NULL);
+	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp15_) : NULL);
 #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->password_entry);
 #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->password_entry = _tmp30_;
-#line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp31_ = builder;
+	self->priv->password_entry = _tmp16_;
 #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp32_ = gtk_builder_get_object (_tmp31_, "go_back_button");
+	_tmp17_ = gtk_builder_get_object (builder, "go_back_button");
 #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_button_get_type ()) ? ((GtkButton*) _tmp32_) : NULL);
+	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
 #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->go_back_button);
 #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->go_back_button = _tmp33_;
+	self->priv->go_back_button = _tmp18_;
 #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp34_ = builder;
+	_tmp19_ = gtk_builder_get_object (builder, "login_button");
 #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp35_ = gtk_builder_get_object (_tmp34_, "login_button");
-#line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_button_get_type ()) ? ((GtkButton*) _tmp35_) : NULL);
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_button_get_type ()) ? ((GtkButton*) _tmp19_) : NULL);
 #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (self->priv->login_button);
 #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->login_button = _tmp36_;
-#line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp37_ = mode;
+	self->priv->login_button = _tmp20_;
 #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	switch (_tmp37_) {
+	switch (mode) {
 #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO:
-#line 11960 "GalleryConnector.c"
+#line 12049 "GalleryConnector.c"
 		{
-			GtkLabel* _tmp38_;
+			GtkLabel* _tmp21_;
 #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp38_ = self->priv->intro_message_label;
+			_tmp21_ = self->priv->intro_message_label;
 #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			gtk_label_set_markup (_tmp38_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE);
+			gtk_label_set_markup (_tmp21_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE);
 #line 1868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			break;
-#line 11969 "GalleryConnector.c"
+#line 12058 "GalleryConnector.c"
 		}
 #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY:
-#line 11973 "GalleryConnector.c"
+#line 12062 "GalleryConnector.c"
 		{
-			GtkLabel* _tmp39_;
-			gchar* _tmp40_;
-			gchar* _tmp41_;
+			GtkLabel* _tmp22_;
+			gchar* _tmp23_;
+			gchar* _tmp24_;
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp39_ = self->priv->intro_message_label;
+			_tmp22_ = self->priv->intro_message_label;
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp40_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Unrecognized User"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE);
+			_tmp23_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Unrecognized User"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE);
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp41_ = _tmp40_;
+			_tmp24_ = _tmp23_;
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			gtk_label_set_markup (_tmp39_, _tmp41_);
+			gtk_label_set_markup (_tmp22_, _tmp24_);
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_g_free0 (_tmp41_);
+			_g_free0 (_tmp24_);
 #line 1873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			break;
-#line 11990 "GalleryConnector.c"
+#line 12079 "GalleryConnector.c"
 		}
 #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL:
-#line 11994 "GalleryConnector.c"
+#line 12083 "GalleryConnector.c"
 		{
-			GtkLabel* _tmp42_;
-			gchar* _tmp43_;
-			gchar* _tmp44_;
+			GtkLabel* _tmp25_;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp42_ = self->priv->intro_message_label;
+			_tmp25_ = self->priv->intro_message_label;
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp43_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE);
+			_tmp26_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE);
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp44_ = _tmp43_;
+			_tmp27_ = _tmp26_;
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			gtk_label_set_markup (_tmp42_, _tmp44_);
+			gtk_label_set_markup (_tmp25_, _tmp27_);
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_g_free0 (_tmp44_);
+			_g_free0 (_tmp27_);
 #line 1879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			break;
-#line 12011 "GalleryConnector.c"
+#line 12100 "GalleryConnector.c"
 		}
 		default:
 		{
 #line 1882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			g_error ("GalleryConnector.vala:1882: Invalid CredentialsPane mode");
-#line 12017 "GalleryConnector.c"
+#line 12106 "GalleryConnector.c"
 		}
 	}
 #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp45_ = url;
-#line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp45_ != NULL) {
-#line 12024 "GalleryConnector.c"
-		GtkEntry* _tmp46_;
-		const gchar* _tmp47_;
-		GtkEntry* _tmp48_;
-#line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp46_ = self->priv->url_entry;
+	if (url != NULL) {
+#line 12111 "GalleryConnector.c"
+		GtkEntry* _tmp28_;
+		GtkEntry* _tmp29_;
 #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp47_ = url;
+		_tmp28_ = self->priv->url_entry;
 #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_entry_set_text (_tmp46_, _tmp47_);
+		gtk_entry_set_text (_tmp28_, url);
 #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp48_ = self->priv->username_entry;
+		_tmp29_ = self->priv->username_entry;
 #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 12038 "GalleryConnector.c"
+		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
+#line 12122 "GalleryConnector.c"
 	}
 #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp49_ = self->priv->url_entry;
+	_tmp30_ = self->priv->url_entry;
 #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
-#line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp50_ = username;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
 #line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp50_ != NULL) {
-#line 12048 "GalleryConnector.c"
-		GtkEntry* _tmp51_;
-		const gchar* _tmp52_;
-		GtkEntry* _tmp53_;
-#line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp51_ = self->priv->username_entry;
+	if (username != NULL) {
+#line 12130 "GalleryConnector.c"
+		GtkEntry* _tmp31_;
+		GtkEntry* _tmp32_;
 #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp52_ = username;
+		_tmp31_ = self->priv->username_entry;
 #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_entry_set_text (_tmp51_, _tmp52_);
+		gtk_entry_set_text (_tmp31_, username);
 #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp53_ = self->priv->password_entry;
+		_tmp32_ = self->priv->password_entry;
 #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
-#line 12062 "GalleryConnector.c"
+		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
+#line 12141 "GalleryConnector.c"
 	}
 #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp54_ = self->priv->username_entry;
+	_tmp33_ = self->priv->username_entry;
 #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
 #line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp55_ = key;
-#line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp55_ != NULL) {
-#line 12072 "GalleryConnector.c"
-		GtkEntry* _tmp56_;
-		const gchar* _tmp57_;
-		GtkEntry* _tmp58_;
-#line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp56_ = self->priv->key_entry;
+	if (key != NULL) {
+#line 12149 "GalleryConnector.c"
+		GtkEntry* _tmp34_;
+		GtkEntry* _tmp35_;
 #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp57_ = key;
+		_tmp34_ = self->priv->key_entry;
 #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_entry_set_text (_tmp56_, _tmp57_);
+		gtk_entry_set_text (_tmp34_, key);
 #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp58_ = self->priv->key_entry;
+		_tmp35_ = self->priv->key_entry;
 #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
-#line 12086 "GalleryConnector.c"
+		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
+#line 12160 "GalleryConnector.c"
 	}
 #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp59_ = self->priv->key_entry;
+	_tmp36_ = self->priv->key_entry;
 #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
 #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp60_ = self->priv->go_back_button;
+	_tmp37_ = self->priv->go_back_button;
 #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp60_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp37_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0);
 #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp61_ = self->priv->login_button;
+	_tmp38_ = self->priv->login_button;
 #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp38_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp63_ = url;
+	if (url != NULL) {
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp63_ != NULL) {
-#line 12104 "GalleryConnector.c"
-		const gchar* _tmp64_;
-#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp64_ = username;
-#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp62_ = _tmp64_ != NULL;
-#line 12110 "GalleryConnector.c"
+		_tmp39_ = username != NULL;
+#line 12178 "GalleryConnector.c"
 	} else {
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp62_ = FALSE;
-#line 12114 "GalleryConnector.c"
+		_tmp39_ = FALSE;
+#line 12182 "GalleryConnector.c"
 	}
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp65_ = self->priv->login_button;
+	_tmp40_ = self->priv->login_button;
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp62_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp39_);
 #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 12122 "GalleryConnector.c"
+#line 12190 "GalleryConnector.c"
 }
 
 
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) {
+PublishingGallery3CredentialsGrid*
+publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host,
+                                          PublishingGallery3CredentialsPaneMode mode,
+                                          const gchar* url,
+                                          const gchar* username,
+                                          const gchar* key,
+                                          GtkBuilder* builder)
+{
 #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_credentials_grid_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, host, mode, url, username, key, builder);
-#line 12129 "GalleryConnector.c"
+#line 12204 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self) {
+static void
+publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self)
+{
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
 	GtkEntry* _tmp2_;
@@ -12201,20 +12278,24 @@ static void publishing_gallery3_credentials_grid_on_login_button_clicked (Publis
 	_tmp7_ = gtk_entry_get_text (_tmp6_);
 #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 12162 "GalleryConnector.c"
+#line 12239 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self) {
+static void
+publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self)
+{
 #line 1916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self));
 #line 1917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL], 0);
-#line 12171 "GalleryConnector.c"
+#line 12250 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self) {
+static void
+publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self)
+{
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GtkEntry* _tmp2_;
@@ -12228,7 +12309,7 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
 #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 12189 "GalleryConnector.c"
+#line 12270 "GalleryConnector.c"
 		GtkEntry* _tmp4_;
 		const gchar* _tmp5_;
 #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12237,17 +12318,17 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub
 		_tmp5_ = gtk_entry_get_text (_tmp4_);
 #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 12198 "GalleryConnector.c"
+#line 12279 "GalleryConnector.c"
 	} else {
 #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = FALSE;
-#line 12202 "GalleryConnector.c"
+#line 12283 "GalleryConnector.c"
 	}
 #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp1_) {
 #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = TRUE;
-#line 12208 "GalleryConnector.c"
+#line 12289 "GalleryConnector.c"
 	} else {
 		GtkEntry* _tmp6_;
 		const gchar* _tmp7_;
@@ -12257,17 +12338,19 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub
 		_tmp7_ = gtk_entry_get_text (_tmp6_);
 #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = g_strcmp0 (_tmp7_, "") != 0;
-#line 12218 "GalleryConnector.c"
+#line 12299 "GalleryConnector.c"
 	}
 #line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp8_ = self->priv->login_button;
 #line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 12224 "GalleryConnector.c"
+#line 12305 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self) {
+void
+publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	GtkButton* _tmp2_;
@@ -12283,11 +12366,13 @@ void publishing_gallery3_credentials_grid_installed (PublishingGallery3Credentia
 	_tmp2_ = self->priv->login_button;
 #line 1931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	spit_publishing_plugin_host_set_dialog_default_widget (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 12244 "GalleryConnector.c"
+#line 12327 "GalleryConnector.c"
 }
 
 
-GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self) {
+GtkGrid*
+publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self)
+{
 	GtkGrid* result;
 	GtkGrid* _tmp0_;
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12298,34 +12383,36 @@ GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery
 	result = _tmp0_;
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12259 "GalleryConnector.c"
+#line 12344 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value) {
+static void
+publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self,
+                                                      GtkGrid* value)
+{
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self));
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (publishing_gallery3_credentials_grid_get_pane_widget (self) != value) {
-#line 12268 "GalleryConnector.c"
+#line 12356 "GalleryConnector.c"
 		GtkGrid* _tmp0_;
-		GtkGrid* _tmp1_;
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp0_ = value;
-#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_object_unref0 (self->priv->_pane_widget);
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		self->priv->_pane_widget = _tmp1_;
+		self->priv->_pane_widget = _tmp0_;
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		g_object_notify ((GObject *) self, "pane-widget");
-#line 12281 "GalleryConnector.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY]);
+#line 12366 "GalleryConnector.c"
 	}
 }
 
 
-static void publishing_gallery3_credentials_grid_class_init (PublishingGallery3CredentialsGridClass * klass) {
+static void
+publishing_gallery3_credentials_grid_class_init (PublishingGallery3CredentialsGridClass * klass)
+{
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_parent_class = g_type_class_peek_parent (klass);
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12337,16 +12424,18 @@ static void publishing_gallery3_credentials_grid_class_init (PublishingGallery3C
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_credentials_grid_finalize;
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY] = g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-#line 12303 "GalleryConnector.c"
+#line 12390 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_grid_instance_init (PublishingGallery3CredentialsGrid * self) {
+static void
+publishing_gallery3_credentials_grid_instance_init (PublishingGallery3CredentialsGrid * self)
+{
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_CREDENTIALS_GRID_GET_PRIVATE (self);
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12375,11 +12464,13 @@ static void publishing_gallery3_credentials_grid_instance_init (PublishingGaller
 	self->priv->username = NULL;
 #line 1834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->key = NULL;
-#line 12336 "GalleryConnector.c"
+#line 12425 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_credentials_grid_finalize (GObject * obj) {
+static void
+publishing_gallery3_credentials_grid_finalize (GObject * obj)
+{
 	PublishingGallery3CredentialsGrid * self;
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid);
@@ -12409,11 +12500,13 @@ static void publishing_gallery3_credentials_grid_finalize (GObject * obj) {
 	_g_free0 (self->priv->key);
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (publishing_gallery3_credentials_grid_parent_class)->finalize (obj);
-#line 12370 "GalleryConnector.c"
+#line 12461 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_credentials_grid_get_type (void) {
+GType
+publishing_gallery3_credentials_grid_get_type (void)
+{
 	static volatile gsize publishing_gallery3_credentials_grid_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_credentials_grid_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3CredentialsGridClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_credentials_grid_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3CredentialsGrid), 0, (GInstanceInitFunc) publishing_gallery3_credentials_grid_instance_init, NULL };
@@ -12425,7 +12518,12 @@ GType publishing_gallery3_credentials_grid_get_type (void) {
 }
 
 
-static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_gallery3_credentials_grid_get_property (GObject * object,
+                                                         guint property_id,
+                                                         GValue * value,
+                                                         GParamSpec * pspec)
+{
 	PublishingGallery3CredentialsGrid * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid);
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12436,18 +12534,23 @@ static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * o
 		g_value_set_object (value, publishing_gallery3_credentials_grid_get_pane_widget (self));
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		break;
-#line 12397 "GalleryConnector.c"
+#line 12495 "GalleryConnector.c"
 		default:
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		break;
-#line 12403 "GalleryConnector.c"
+#line 12501 "GalleryConnector.c"
 	}
 }
 
 
-static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_gallery3_credentials_grid_set_property (GObject * object,
+                                                         guint property_id,
+                                                         const GValue * value,
+                                                         GParamSpec * pspec)
+{
 	PublishingGallery3CredentialsGrid * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid);
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12458,35 +12561,41 @@ static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * o
 		publishing_gallery3_credentials_grid_set_pane_widget (self, g_value_get_object (value));
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		break;
-#line 12419 "GalleryConnector.c"
+#line 12522 "GalleryConnector.c"
 		default:
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		break;
-#line 12425 "GalleryConnector.c"
+#line 12528 "GalleryConnector.c"
 	}
 }
 
 
-PublishingGallery3Session* publishing_gallery3_session_construct (GType object_type) {
+PublishingGallery3Session*
+publishing_gallery3_session_construct (GType object_type)
+{
 	PublishingGallery3Session* self = NULL;
 #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = (PublishingGallery3Session*) publishing_rest_support_session_construct (object_type, NULL);
 #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 12436 "GalleryConnector.c"
+#line 12541 "GalleryConnector.c"
 }
 
 
-PublishingGallery3Session* publishing_gallery3_session_new (void) {
+PublishingGallery3Session*
+publishing_gallery3_session_new (void)
+{
 #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_session_construct (PUBLISHING_GALLERY3_TYPE_SESSION);
-#line 12443 "GalleryConnector.c"
+#line 12550 "GalleryConnector.c"
 }
 
 
-static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
 	PublishingGallery3Session * self;
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
@@ -12498,14 +12607,16 @@ static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRES
 	result = NULL != _tmp0_;
 #line 1946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12459 "GalleryConnector.c"
+#line 12568 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
+void
+publishing_gallery3_session_authenticate (PublishingGallery3Session* self,
+                                          const gchar* gallery_url,
+                                          const gchar* username,
+                                          const gchar* key)
+{
 #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
 #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12515,24 +12626,20 @@ void publishing_gallery3_session_authenticate (PublishingGallery3Session* self,
 #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (key != NULL);
 #line 1950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = gallery_url;
-#line 1950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_session_set_url (self, _tmp0_);
+	publishing_gallery3_session_set_url (self, gallery_url);
 #line 1951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = username;
-#line 1951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_session_set_username (self, _tmp1_);
-#line 1952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = key;
+	publishing_gallery3_session_set_username (self, username);
 #line 1952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	publishing_gallery3_session_set_key (self, _tmp2_);
+	publishing_gallery3_session_set_key (self, key);
 #line 1954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_rest_support_session_notify_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 12489 "GalleryConnector.c"
+#line 12594 "GalleryConnector.c"
 }
 
 
-void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self) {
+void
+publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self)
+{
 #line 1957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
 #line 1958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12541,11 +12648,13 @@ void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self
 	publishing_gallery3_session_set_username (self, NULL);
 #line 1960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_session_set_key (self, NULL);
-#line 12502 "GalleryConnector.c"
+#line 12609 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self) {
+const gchar*
+publishing_gallery3_session_get_url (PublishingGallery3Session* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12556,28 +12665,30 @@ const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* sel
 	result = _tmp0_;
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12517 "GalleryConnector.c"
+#line 12626 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_session_set_url (PublishingGallery3Session* self,
+                                     const gchar* value)
+{
+	gchar* _tmp0_;
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_url);
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_url = _tmp1_;
-#line 12534 "GalleryConnector.c"
+	self->priv->_url = _tmp0_;
+#line 12643 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self) {
+const gchar*
+publishing_gallery3_session_get_username (PublishingGallery3Session* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12588,28 +12699,30 @@ const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session
 	result = _tmp0_;
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12549 "GalleryConnector.c"
+#line 12660 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_session_set_username (PublishingGallery3Session* self,
+                                          const gchar* value)
+{
+	gchar* _tmp0_;
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_username);
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_username = _tmp1_;
-#line 12566 "GalleryConnector.c"
+	self->priv->_username = _tmp0_;
+#line 12677 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self) {
+const gchar*
+publishing_gallery3_session_get_key (PublishingGallery3Session* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12620,28 +12733,30 @@ const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* sel
 	result = _tmp0_;
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12581 "GalleryConnector.c"
+#line 12694 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+publishing_gallery3_session_set_key (PublishingGallery3Session* self,
+                                     const gchar* value)
+{
+	gchar* _tmp0_;
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = value;
-#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (self->priv->_key);
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_key = _tmp1_;
-#line 12598 "GalleryConnector.c"
+	self->priv->_key = _tmp0_;
+#line 12711 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_session_class_init (PublishingGallery3SessionClass * klass) {
+static void
+publishing_gallery3_session_class_init (PublishingGallery3SessionClass * klass)
+{
 #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_session_parent_class = g_type_class_peek_parent (klass);
 #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12650,11 +12765,13 @@ static void publishing_gallery3_session_class_init (PublishingGallery3SessionCla
 	g_type_class_add_private (klass, sizeof (PublishingGallery3SessionPrivate));
 #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_gallery3_session_real_is_authenticated;
-#line 12611 "GalleryConnector.c"
+#line 12726 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_session_instance_init (PublishingGallery3Session * self) {
+static void
+publishing_gallery3_session_instance_init (PublishingGallery3Session * self)
+{
 #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_SESSION_GET_PRIVATE (self);
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12663,11 +12780,13 @@ static void publishing_gallery3_session_instance_init (PublishingGallery3Session
 	self->priv->_username = NULL;
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_key = NULL;
-#line 12624 "GalleryConnector.c"
+#line 12741 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj)
+{
 	PublishingGallery3Session * self;
 #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
@@ -12679,11 +12798,13 @@ static void publishing_gallery3_session_finalize (PublishingRESTSupportSession *
 	_g_free0 (self->priv->_key);
 #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_gallery3_session_parent_class)->finalize (obj);
-#line 12640 "GalleryConnector.c"
+#line 12759 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_session_get_type (void) {
+GType
+publishing_gallery3_session_get_type (void)
+{
 	static volatile gsize publishing_gallery3_session_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_session_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3SessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3Session), 0, (GInstanceInitFunc) publishing_gallery3_session_instance_init, NULL };
@@ -12695,66 +12816,69 @@ GType publishing_gallery3_session_get_type (void) {
 }
 
 
-PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3Uploader*
+publishing_gallery3_uploader_construct (GType object_type,
+                                        PublishingGallery3Session* session,
+                                        SpitPublishingPublishable** publishables,
+                                        int publishables_length1,
+                                        PublishingGallery3PublishingParameters* parameters)
+{
 	PublishingGallery3Uploader* self = NULL;
-	PublishingGallery3Session* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingGallery3PublishingParameters* _tmp2_;
-	PublishingGallery3PublishingParameters* _tmp3_;
+	PublishingGallery3PublishingParameters* _tmp0_;
 #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
 #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (parameters), NULL);
 #line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = session;
-#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishables;
-#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1__length1 = publishables_length1;
-#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self = (PublishingGallery3Uploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = parameters;
+	self = (PublishingGallery3Uploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
 #line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp2_);
+	_tmp0_ = _publishing_gallery3_publishing_parameters_ref0 (parameters);
 #line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_gallery3_publishing_parameters_unref0 (self->priv->parameters);
 #line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->parameters = _tmp3_;
+	self->priv->parameters = _tmp0_;
 #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 12685 "GalleryConnector.c"
+#line 12800 "GalleryConnector.c"
 }
 
 
-PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3Uploader*
+publishing_gallery3_uploader_new (PublishingGallery3Session* session,
+                                  SpitPublishingPublishable** publishables,
+                                  int publishables_length1,
+                                  PublishingGallery3PublishingParameters* parameters)
+{
 #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return publishing_gallery3_uploader_construct (PUBLISHING_GALLERY3_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 12692 "GalleryConnector.c"
+#line 12812 "GalleryConnector.c"
 }
 
 
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_transaction_ref0 (gpointer self)
+{
 #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 12699 "GalleryConnector.c"
+#line 12821 "GalleryConnector.c"
 }
 
 
-static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                      SpitPublishingPublishable* publishable)
+{
 	PublishingGallery3Uploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	SpitPublishingPublishable* p = NULL;
 	SpitPublishingPublishable* _tmp0_;
 	gchar* _tmp1_;
-	SpitPublishingPublisherMediaType _tmp2_;
-	PublishingRESTSupportSession* _tmp3_;
-	PublishingGallery3Session* _tmp4_;
-	PublishingGallery3PublishingParameters* _tmp5_;
-	PublishingGallery3GalleryUploadTransaction* _tmp6_;
+	PublishingRESTSupportSession* _tmp2_;
+	PublishingGallery3Session* _tmp3_;
+	PublishingGallery3PublishingParameters* _tmp4_;
+	PublishingGallery3GalleryUploadTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
 	PublishingRESTSupportTransaction* _tmp7_;
-	PublishingRESTSupportTransaction* _tmp8_;
 #line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader);
 #line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12770,38 +12894,38 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat
 #line 2004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_current_publishable_name = _tmp1_;
 #line 2006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = spit_publishing_publishable_get_media_type (p);
-#line 2006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_current_media_type = _tmp2_;
+	self->priv->_current_media_type = spit_publishing_publishable_get_media_type (p);
 #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp3_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+	_tmp2_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
 #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
 #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = self->priv->parameters;
+	_tmp4_ = self->priv->parameters;
 #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = publishing_gallery3_gallery_upload_transaction_new (_tmp4_, _tmp5_, p);
+	_tmp5_ = publishing_gallery3_gallery_upload_transaction_new (_tmp3_, _tmp4_, p);
 #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (self->priv->_current_transaction);
 #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_current_transaction = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+	self->priv->_current_transaction = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
 #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_publishing_rest_support_session_unref0 (_tmp4_);
+	_publishing_rest_support_session_unref0 (_tmp3_);
 #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = self->priv->_current_transaction;
+	_tmp6_ = self->priv->_current_transaction;
 #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp8_ = _publishing_rest_support_transaction_ref0 (_tmp7_);
+	_tmp7_ = _publishing_rest_support_transaction_ref0 (_tmp6_);
 #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp8_;
+	result = _tmp7_;
 #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (p);
 #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12758 "GalleryConnector.c"
+#line 12880 "GalleryConnector.c"
 }
 
 
-const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self) {
+const gchar*
+publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12812,29 +12936,30 @@ const gchar* publishing_gallery3_uploader_get_current_publishable_name (Publishi
 	result = _tmp0_;
 #line 1975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12773 "GalleryConnector.c"
+#line 12897 "GalleryConnector.c"
 }
 
 
-guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self) {
+guint
+publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self)
+{
 	guint result;
 	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
 #line 1979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), 0U);
 #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->_current_transaction;
 #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = publishing_rest_support_transaction_get_status_code (_tmp0_);
-#line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp1_;
+	result = publishing_rest_support_transaction_get_status_code (_tmp0_);
 #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12791 "GalleryConnector.c"
+#line 12914 "GalleryConnector.c"
 }
 
 
-SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self) {
+SpitPublishingPublisherMediaType
+publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self)
+{
 	SpitPublishingPublisherMediaType result;
 	SpitPublishingPublisherMediaType _tmp0_;
 #line 1985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12845,11 +12970,13 @@ SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publis
 	result = _tmp0_;
 #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12806 "GalleryConnector.c"
+#line 12931 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderClass * klass) {
+static void
+publishing_gallery3_uploader_class_init (PublishingGallery3UploaderClass * klass)
+{
 #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_uploader_parent_class = g_type_class_peek_parent (klass);
 #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12858,18 +12985,22 @@ static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderC
 	g_type_class_add_private (klass, sizeof (PublishingGallery3UploaderPrivate));
 #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction;
-#line 12819 "GalleryConnector.c"
+#line 12946 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_uploader_instance_init (PublishingGallery3Uploader * self) {
+static void
+publishing_gallery3_uploader_instance_init (PublishingGallery3Uploader * self)
+{
 #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE (self);
-#line 12826 "GalleryConnector.c"
+#line 12955 "GalleryConnector.c"
 }
 
 
-static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
 	PublishingGallery3Uploader * self;
 #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader);
@@ -12881,11 +13012,13 @@ static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUpl
 	_publishing_rest_support_transaction_unref0 (self->priv->_current_transaction);
 #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_gallery3_uploader_parent_class)->finalize (obj);
-#line 12842 "GalleryConnector.c"
+#line 12973 "GalleryConnector.c"
 }
 
 
-GType publishing_gallery3_uploader_get_type (void) {
+GType
+publishing_gallery3_uploader_get_type (void)
+{
 	static volatile gsize publishing_gallery3_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_gallery3_uploader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3UploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3Uploader), 0, (GInstanceInitFunc) publishing_gallery3_uploader_instance_init, NULL };
@@ -12897,97 +13030,85 @@ GType publishing_gallery3_uploader_get_type (void) {
 }
 
 
-static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) {
+static gint
+string_last_index_of (const gchar* self,
+                      const gchar* needle,
+                      gint start_index)
+{
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = needle;
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 12881 "GalleryConnector.c"
-		gchar* _tmp4_;
-#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = g_strrstr (((gchar*) self) + start_index, (gchar*) needle);
+#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_result_ = _tmp0_;
+#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = _result_;
+#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_ != NULL) {
+#line 13012 "GalleryConnector.c"
+		gchar* _tmp2_;
+#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = _result_;
+#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 12889 "GalleryConnector.c"
+#line 13020 "GalleryConnector.c"
 	} else {
-#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 12895 "GalleryConnector.c"
+#line 13026 "GalleryConnector.c"
 	}
 }
 
 
-gchar* publishing_gallery3_strip_session_url (const gchar* url) {
+gchar*
+publishing_gallery3_strip_session_url (const gchar* url)
+{
 	gchar* result = NULL;
-	const gchar* _tmp0_;
 	gint item_loc = 0;
-	const gchar* _tmp1_;
-	gint _tmp2_;
-	const gchar* _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-	gchar* _tmp7_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
 #line 2017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 2020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = url;
-#line 2020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_debug ("GalleryConnector.vala:2020: Searching for \"%s\" in \"%s\"", PUBLISHING_GALLERY3_REST_PATH, _tmp0_);
-#line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = url;
-#line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp2_ = string_last_index_of (_tmp1_, PUBLISHING_GALLERY3_REST_PATH, 0);
+	g_debug ("GalleryConnector.vala:2020: Searching for \"%s\" in \"%s\"", PUBLISHING_GALLERY3_REST_PATH, url);
 #line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	item_loc = _tmp2_;
+	item_loc = string_last_index_of (url, PUBLISHING_GALLERY3_REST_PATH, 0);
 #line 2025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (-1 == item_loc) {
-#line 12924 "GalleryConnector.c"
-		const gchar* _tmp3_;
-#line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp3_ = url;
 #line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		g_error ("Did not find \"%s\" in the base of the new item " "URL \"%s\"", PUBLISHING_GALLERY3_REST_PATH, _tmp3_);
-#line 12930 "GalleryConnector.c"
+		g_error ("Did not find \"%s\" in the base of the new item " "URL \"%s\"", PUBLISHING_GALLERY3_REST_PATH, url);
+#line 13049 "GalleryConnector.c"
 	}
 #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp4_ = url;
+	_tmp0_ = strlen (PUBLISHING_GALLERY3_REST_PATH);
 #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp5_ = strlen (PUBLISHING_GALLERY3_REST_PATH);
-#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp6_ = _tmp5_;
+	_tmp1_ = _tmp0_;
 #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp7_ = string_substring (_tmp4_, (glong) (item_loc + _tmp6_), (glong) -1);
+	_tmp2_ = string_substring (url, (glong) (item_loc + _tmp1_), (glong) -1);
 #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp7_;
+	result = _tmp2_;
 #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12944 "GalleryConnector.c"
+#line 13061 "GalleryConnector.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) {
@@ -12999,7 +13120,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-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c
index c63d685..c3963aa 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.c
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -1,4 +1,4 @@
-/* RajcePublishing.c generated by valac 0.36.6, the Vala compiler
+/* RajcePublishing.c generated by valac 0.40.4, the Vala compiler
  * generated from RajcePublishing.vala, do not modify */
 
 /* Copyright 2014 rajce.net
@@ -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>
@@ -36,6 +37,11 @@
 typedef struct _RajceService RajceService;
 typedef struct _RajceServiceClass RajceServiceClass;
 typedef struct _RajceServicePrivate RajceServicePrivate;
+enum  {
+	RAJCE_SERVICE_0_PROPERTY,
+	RAJCE_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* rajce_service_properties[RAJCE_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER (publishing_rajce_rajce_publisher_get_type ())
@@ -78,6 +84,11 @@ typedef struct _PublishingRajceAlbumClass PublishingRajceAlbumClass;
 
 typedef struct _PublishingRajcePublishingParameters PublishingRajcePublishingParameters;
 typedef struct _PublishingRajcePublishingParametersClass PublishingRajcePublishingParametersClass;
+enum  {
+	PUBLISHING_RAJCE_RAJCE_PUBLISHER_0_PROPERTY,
+	PUBLISHING_RAJCE_RAJCE_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rajce_rajce_publisher_properties[PUBLISHING_RAJCE_RAJCE_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_rajce_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rajce_publishing_parameters_unref (var), NULL)))
@@ -204,17 +215,27 @@ typedef struct _PublishingRajceAddPhotoTransaction PublishingRajceAddPhotoTransa
 typedef struct _PublishingRajceAddPhotoTransactionClass PublishingRajceAddPhotoTransactionClass;
 typedef struct _PublishingRajceAuthenticationPanePrivate PublishingRajceAuthenticationPanePrivate;
 enum  {
+	PUBLISHING_RAJCE_AUTHENTICATION_PANE_0_PROPERTY,
+	PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rajce_authentication_pane_properties[PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_PROPERTIES];
+enum  {
 	PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL,
-	PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL
+	PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_SIGNALS
 };
-static guint publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingRajcePublishingOptionsPanePrivate PublishingRajcePublishingOptionsPanePrivate;
 enum  {
+	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rajce_publishing_options_pane_properties[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
+enum  {
 	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
 	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingRajceParamSpecPublishingParameters PublishingRajceParamSpecPublishingParameters;
 typedef struct _PublishingRajceSessionPrivate PublishingRajceSessionPrivate;
 
@@ -592,43 +613,59 @@ static gpointer publishing_rajce_get_categories_transaction_parent_class = NULL;
 static gpointer publishing_rajce_add_photo_transaction_parent_class = NULL;
 
 GType rajce_service_get_type (void) G_GNUC_CONST;
-enum  {
-	RAJCE_SERVICE_DUMMY_PROPERTY
-};
 #define RAJCE_SERVICE_ICON_FILENAME "rajce.png"
 RajceService* rajce_service_new (GFile* resource_directory);
-RajceService* rajce_service_construct (GType object_type, GFile* resource_directory);
-static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+RajceService* rajce_service_construct (GType object_type,
+                                       GFile* resource_directory);
+static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                 gint min_host_interface,
+                                                 gint max_host_interface);
 static const gchar* rajce_service_real_get_id (SpitPluggable* base);
 static const gchar* rajce_service_real_get_pluggable_name (SpitPluggable* base);
-static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length);
-static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void rajce_service_real_get_info (SpitPluggable* base,
+                                  SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self,
+                              int length);
+static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base,
+                                                              SpitPublishingPluginHost* host);
+PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_new (SpitPublishingService* service,
+                                                                     SpitPublishingPluginHost* host);
+PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type,
+                                                                           SpitPublishingService* service,
+                                                                           SpitPublishingPluginHost* host);
 GType publishing_rajce_rajce_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media (SpitPublishingService* base);
-static void rajce_service_real_activation (SpitPluggable* base, gboolean enabled);
+static void rajce_service_real_activation (SpitPluggable* base,
+                                    gboolean enabled);
 static void rajce_service_finalize (GObject * obj);
 GType publishing_rajce_session_get_type (void) G_GNUC_CONST;
 gpointer publishing_rajce_album_ref (gpointer instance);
 void publishing_rajce_album_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_album (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_album (const gchar* name,
+                                               const gchar* nick,
+                                               const gchar* blurb,
+                                               GType object_type,
+                                               GParamFlags flags);
+void publishing_rajce_value_set_album (GValue* value,
+                                       gpointer v_object);
+void publishing_rajce_value_take_album (GValue* value,
+                                        gpointer v_object);
 gpointer publishing_rajce_value_get_album (const GValue* value);
 GType publishing_rajce_album_get_type (void) G_GNUC_CONST;
 gpointer publishing_rajce_publishing_parameters_ref (gpointer instance);
 void publishing_rajce_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name,
+                                                               const gchar* nick,
+                                                               const gchar* blurb,
+                                                               GType object_type,
+                                                               GParamFlags flags);
+void publishing_rajce_value_set_publishing_parameters (GValue* value,
+                                                       gpointer v_object);
+void publishing_rajce_value_take_publishing_parameters (GValue* value,
+                                                        gpointer v_object);
 gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value);
 GType publishing_rajce_publishing_parameters_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_RAJCE_RAJCE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisherPrivate))
-enum  {
-	PUBLISHING_RAJCE_RAJCE_PUBLISHER_DUMMY_PROPERTY
-};
 PublishingRajceSession* publishing_rajce_session_new (void);
 PublishingRajceSession* publishing_rajce_session_construct (GType object_type);
 static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self);
@@ -641,269 +678,469 @@ gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublis
 gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self);
 gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self);
 static gboolean* _bool_dup (gboolean* self);
-static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember);
+static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self,
+                                                        const gchar* username,
+                                                        const gchar* token,
+                                                        gboolean remember);
 GType publishing_rajce_authentication_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self, PublishingRajceAuthenticationPaneMode mode);
+static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self,
+                                                                   PublishingRajceAuthenticationPaneMode mode);
 static void publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher* base);
 gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self);
-static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self, const gchar* username);
-static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self, const gchar* token);
-static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self, gboolean remember);
+static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self,
+                                                    const gchar* username);
+static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self,
+                                                 const gchar* token);
+static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self,
+                                                    gboolean remember);
 gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self);
-void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self, gboolean hide_album);
+void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self,
+                                                      gboolean hide_album);
 gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self);
-void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self, gboolean show_album);
+void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self,
+                                                      gboolean show_album);
 GType publishing_rajce_authentication_pane_get_type (void) G_GNUC_CONST;
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode);
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode);
-static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember);
-static void _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender, const gchar* user, const gchar* token, gboolean remember, gpointer self);
+PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher,
+                                                                             PublishingRajceAuthenticationPaneMode mode);
+PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type,
+                                                                                   PublishingRajceRajcePublisher* publisher,
+                                                                                   PublishingRajceAuthenticationPaneMode mode);
+static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self,
+                                                                            const gchar* username,
+                                                                            const gchar* token,
+                                                                            gboolean remember);
+static void _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender,
+                                                                                                                        const gchar* user,
+                                                                                                                        const gchar* token,
+                                                                                                                        gboolean remember,
+                                                                                                                        gpointer self);
 GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self);
 GType publishing_rajce_transaction_get_type (void) G_GNUC_CONST;
 GType publishing_rajce_session_login_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token);
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token);
-static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self, GError* e);
+PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session,
+                                                                                        const gchar* url,
+                                                                                        const gchar* username,
+                                                                                        const gchar* token);
+PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_construct (GType object_type,
+                                                                                              PublishingRajceSession* session,
+                                                                                              const gchar* url,
+                                                                                              const gchar* username,
+                                                                                              const gchar* token);
+static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self,
+                                                              PublishingRESTSupportTransaction* bad_txn,
+                                                              GError* err);
+static void _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                 GError* err,
+                                                                                                                 gpointer self);
+static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self,
+                                                                 PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                gpointer self);
+static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self,
+                                                     GError* e);
 gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-void publishing_rajce_session_authenticate (PublishingRajceSession* self, const gchar* token, const gchar* name, gint id, gint maxsize, gint quality);
+static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                                 gpointer self);
+void publishing_rajce_session_authenticate (PublishingRajceSession* self,
+                                            const gchar* token,
+                                            const gchar* name,
+                                            gint id,
+                                            gint maxsize,
+                                            gint quality);
 GType publishing_rajce_get_albums_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
-static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-PublishingRajceAlbum* publishing_rajce_album_new (gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount);
-PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount);
-gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingRajceAlbum* b);
-static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken);
+PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session,
+                                                                                  const gchar* url);
+PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type,
+                                                                                        PublishingRajceSession* session,
+                                                                                        const gchar* url);
+static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self,
+                                                             PublishingRESTSupportTransaction* bad_txn,
+                                                             GError* err);
+static void _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                GError* err,
+                                                                                                                gpointer self);
+static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self,
+                                                                PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                               gpointer self);
+PublishingRajceAlbum* publishing_rajce_album_new (gint id,
+                                                  const gchar* albumName,
+                                                  const gchar* url,
+                                                  const gchar* thumbUrl,
+                                                  const gchar* createDate,
+                                                  const gchar* updateDate,
+                                                  gboolean hidden,
+                                                  gboolean secure,
+                                                  gint photoCount);
+PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type,
+                                                        gint id,
+                                                        const gchar* albumName,
+                                                        const gchar* url,
+                                                        const gchar* thumbUrl,
+                                                        const gchar* createDate,
+                                                        const gchar* updateDate,
+                                                        gboolean hidden,
+                                                        gboolean secure,
+                                                        gint photoCount);
+gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a,
+                                            PublishingRajceAlbum* b);
+static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a,
+                                                                gconstpointer b,
+                                                                gpointer self);
+void publishing_rajce_session_set_usertoken (PublishingRajceSession* self,
+                                             const gchar* usertoken);
 static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self);
-static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
+static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self,
+                                                        PublishingRESTSupportTransaction* bad_txn,
+                                                        GError* err);
 GType publishing_rajce_publishing_options_pane_get_type (void) G_GNUC_CONST;
 gchar* publishing_rajce_session_get_username (PublishingRajceSession* self);
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1);
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1);
+PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher,
+                                                                                    const gchar* username,
+                                                                                    PublishingRajceAlbum** albums,
+                                                                                    int albums_length1);
+PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_construct (GType object_type,
+                                                                                          PublishingRajceRajcePublisher* publisher,
+                                                                                          const gchar* username,
+                                                                                          PublishingRajceAlbum** albums,
+                                                                                          int albums_length1);
 static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked (PublishingRajceRajcePublisher* self);
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self);
-static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self, PublishingRajcePublishingParameters* parameters);
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self);
+static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                                                  gpointer self);
+static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self,
+                                                                                  PublishingRajcePublishingParameters* parameters);
+static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                                                    PublishingRajcePublishingParameters* parameters,
+                                                                                                                                    gpointer self);
 GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self);
 void publishing_rajce_session_deauthenticate (PublishingRajceSession* self);
 static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self);
-static gboolean _int_equal (const gint * s1, const gint * s2);
+static gboolean _int_equal (const gint * s1,
+                     const gint * s2);
 GType publishing_rajce_create_album_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden);
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden);
-static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session,
+                                                                                      const gchar* url,
+                                                                                      const gchar* albumName,
+                                                                                      gboolean hidden);
+PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type,
+                                                                                            PublishingRajceSession* session,
+                                                                                            const gchar* url,
+                                                                                            const gchar* albumName,
+                                                                                            gboolean hidden);
+static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self,
+                                                             PublishingRESTSupportTransaction* bad_txn,
+                                                             GError* err);
+static void _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                GError* err,
+                                                                                                                gpointer self);
+static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self,
+                                                                PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                               gpointer self);
 GType publishing_rajce_open_album_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session, const gchar* url, gint albumID);
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, gint albumID);
-static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session,
+                                                                                  const gchar* url,
+                                                                                  gint albumID);
+PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_construct (GType object_type,
+                                                                                        PublishingRajceSession* session,
+                                                                                        const gchar* url,
+                                                                                        gint albumID);
+static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self,
+                                                           PublishingRESTSupportTransaction* bad_txn,
+                                                           GError* err);
+static void _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                              GError* err,
+                                                                                                              gpointer self);
+static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self,
+                                                              PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                             gpointer self);
 static gint* _int_dup (gint* self);
-void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken);
+void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self,
+                                              const gchar* albumtoken);
 static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self);
 gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self);
 GType publishing_rajce_uploader_get_type (void) G_GNUC_CONST;
-PublishingRajceUploader* publishing_rajce_uploader_new (PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters);
-PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type, PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters);
-static void publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingRajceUploader* publishing_rajce_uploader_new (PublishingRajceSession* session,
+                                                        const gchar* url,
+                                                        SpitPublishingPublishable** publishables,
+                                                        int publishables_length1,
+                                                        PublishingRajcePublishingParameters* parameters);
+PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type,
+                                                              PublishingRajceSession* session,
+                                                              const gchar* url,
+                                                              SpitPublishingPublishable** publishables,
+                                                              int publishables_length1,
+                                                              PublishingRajcePublishingParameters* parameters);
+static void publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self,
+                                                                 PublishingRESTSupportBatchUploader* uploader,
+                                                                 gint num_published);
+static void _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                         gint num_photos_published,
+                                                                                                                         gpointer self);
+static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self,
+                                                              PublishingRESTSupportBatchUploader* uploader,
+                                                              GError* err);
+static void _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                   GError* err,
+                                                                                                                   gpointer self);
+static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self,
+                                                                       gint file_number,
+                                                                       gdouble completed_fraction);
+static void _publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                          gdouble fraction_complete,
+                                                                                                          gpointer self);
 static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self);
 static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self);
 static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self);
 GType publishing_rajce_get_album_url_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
-static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket);
+PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session,
+                                                                                       const gchar* url);
+PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_construct (GType object_type,
+                                                                                             PublishingRajceSession* session,
+                                                                                             const gchar* url);
+static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self,
+                                                              PublishingRESTSupportTransaction* bad_txn,
+                                                              GError* err);
+static void _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                 GError* err,
+                                                                                                                 gpointer self);
+static void publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self,
+                                                                 PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                gpointer self);
+void publishing_rajce_session_set_albumticket (PublishingRajceSession* self,
+                                               const gchar* albumticket);
 GType publishing_rajce_close_album_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
-static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session,
+                                                                                    const gchar* url);
+PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_construct (GType object_type,
+                                                                                          PublishingRajceSession* session,
+                                                                                          const gchar* url);
+static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self,
+                                                            PublishingRESTSupportTransaction* bad_txn,
+                                                            GError* err);
+static void _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                               GError* err,
+                                                                                                               gpointer self);
+static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self,
+                                                               PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                              gpointer self);
 static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self);
 gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self);
-static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self, const gchar* message);
+static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self,
+                                                             const gchar* message);
 static void publishing_rajce_rajce_publisher_finalize (GObject * obj);
-enum  {
-	PUBLISHING_RAJCE_ALBUM_DUMMY_PROPERTY
-};
 static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj);
 #define PUBLISHING_RAJCE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploaderPrivate))
-enum  {
-	PUBLISHING_RAJCE_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                                     SpitPublishingPublishable* publishable);
+PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session,
+                                                                                const gchar* url,
+                                                                                PublishingRajcePublishingParameters* parameters,
+                                                                                SpitPublishingPublishable* publishable);
+PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type,
+                                                                                      PublishingRajceSession* session,
+                                                                                      const gchar* url,
+                                                                                      PublishingRajcePublishingParameters* parameters,
+                                                                                      SpitPublishingPublishable* publishable);
 GType publishing_rajce_add_photo_transaction_get_type (void) G_GNUC_CONST;
 static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 #define PUBLISHING_RAJCE_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPanePrivate))
-enum  {
-	PUBLISHING_RAJCE_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
 static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self);
-static void _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                 gpointer self);
 static void publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self);
-static void _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                     gpointer self);
 static void publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self);
-static void _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                       gpointer self);
 static void publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self);
 static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__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_BOOLEAN (GClosure * closure,
+                                                          GValue * return_value,
+                                                          guint n_param_values,
+                                                          const GValue * param_values,
+                                                          gpointer invocation_hint,
+                                                          gpointer marshal_data);
 static void publishing_rajce_authentication_pane_finalize (GObject * obj);
 #define PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int length);
+static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self,
+                                         int length);
 static void publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                 gpointer self);
 static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                               gpointer self);
 static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                                gpointer self);
 static void publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                     gpointer self);
 static void publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name, gboolean album_hidden);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_name, gboolean album_hidden);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name, gint album_id);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_name, gint album_id);
+static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                      gpointer self);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name,
+                                                                                              gboolean album_hidden);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type,
+                                                                                                    const gchar* album_name,
+                                                                                                    gboolean album_hidden);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name,
+                                                                                                   gint album_id);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type,
+                                                                                                         const gchar* album_name,
+                                                                                                         gint album_id);
 static void publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self);
 void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self);
-void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters);
+void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self,
+                                                              PublishingRajcePublishingParameters* parameters);
 void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self);
 static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self);
-static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                                PublishingRajcePublishingParameters* parameters,
+                                                                                                                gpointer self);
+static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                              gpointer self);
 static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS (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_RAJCE_PUBLISHING_PARAMETERS (GClosure * closure,
+                                                                           GValue * return_value,
+                                                                           guint n_param_values,
+                                                                           const GValue * param_values,
+                                                                           gpointer invocation_hint,
+                                                                           gpointer marshal_data);
 static void publishing_rajce_publishing_options_pane_finalize (GObject * obj);
-enum  {
-	PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
 static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void);
 static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct (GType object_type);
 static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj);
 #define PUBLISHING_RAJCE_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSessionPrivate))
-enum  {
-	PUBLISHING_RAJCE_SESSION_DUMMY_PROPERTY
-};
 static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSupportSession* base);
 gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self);
 gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self);
 static void publishing_rajce_session_finalize (PublishingRESTSupportSession * obj);
 gpointer publishing_rajce_arg_item_ref (gpointer instance);
 void publishing_rajce_arg_item_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void publishing_rajce_value_set_arg_item (GValue* value,
+                                          gpointer v_object);
+void publishing_rajce_value_take_arg_item (GValue* value,
+                                           gpointer v_object);
 gpointer publishing_rajce_value_get_arg_item (const GValue* value);
 GType publishing_rajce_arg_item_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_RAJCE_ARG_ITEM_DUMMY_PROPERTY
-};
-PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v);
-PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* k, const gchar* v);
-void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, PublishingRajceArgItem* child);
-static void _vala_array_add6 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1);
+PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k,
+                                                       const gchar* v);
+PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type,
+                                                             const gchar* k,
+                                                             const gchar* v);
+void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self,
+                                         PublishingRajceArgItem* child);
+static void _vala_array_add6 (PublishingRajceArgItem** * array,
+                       int* length,
+                       int* size,
+                       PublishingRajceArgItem* value);
+void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self,
+                                            PublishingRajceArgItem** newchildren,
+                                            int newchildren_length1);
 static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj);
 gpointer publishing_rajce_live_api_request_ref (gpointer instance);
 void publishing_rajce_live_api_request_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name,
+                                                          const gchar* nick,
+                                                          const gchar* blurb,
+                                                          GType object_type,
+                                                          GParamFlags flags);
+void publishing_rajce_value_set_live_api_request (GValue* value,
+                                                  gpointer v_object);
+void publishing_rajce_value_take_live_api_request (GValue* value,
+                                                   gpointer v_object);
 gpointer publishing_rajce_value_get_live_api_request (const GValue* value);
 GType publishing_rajce_live_api_request_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, PublishingRajceLiveApiRequestPrivate))
-enum  {
-	PUBLISHING_RAJCE_LIVE_API_REQUEST_DUMMY_PROPERTY
-};
 PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd);
-PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type, const gchar* cmd);
-void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self, const gchar* name, const gchar* val);
-static void _vala_array_add7 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self, const gchar* name, gboolean val);
-void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self, const gchar* name, gint val);
-void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self, const gchar* name, PublishingRajceArgItem** val, int val_length1);
-static void _vala_array_add8 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self, gboolean urlencode);
-static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, PublishingRajceArgItem* arg);
+PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type,
+                                                                            const gchar* cmd);
+void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self,
+                                                 const gchar* name,
+                                                 const gchar* val);
+static void _vala_array_add7 (PublishingRajceArgItem** * array,
+                       int* length,
+                       int* size,
+                       PublishingRajceArgItem* value);
+void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self,
+                                                     const gchar* name,
+                                                     gboolean val);
+void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self,
+                                                    const gchar* name,
+                                                    gint val);
+void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self,
+                                                     const gchar* name,
+                                                     PublishingRajceArgItem** val,
+                                                     int val_length1);
+static void _vala_array_add8 (PublishingRajceArgItem** * array,
+                       int* length,
+                       int* size,
+                       PublishingRajceArgItem* value);
+gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self,
+                                                           gboolean urlencode);
+static void publishing_rajce_live_api_request_WriteParam (xmlNode* node,
+                                                   PublishingRajceArgItem* arg);
 static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj);
-enum  {
-	PUBLISHING_RAJCE_TRANSACTION_DUMMY_PROPERTY
-};
 PublishingRajceTransaction* publishing_rajce_transaction_new (PublishingRajceSession* session);
-PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session);
-enum  {
-	PUBLISHING_RAJCE_SESSION_LOGIN_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_RAJCE_GET_ALBUMS_TRANSACTION_DUMMY_PROPERTY
-};
-static void _vala_array_add9 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add10 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add11 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add12 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add13 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-enum  {
-	PUBLISHING_RAJCE_CREATE_ALBUM_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_RAJCE_OPEN_ALBUM_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_RAJCE_GET_ALBUM_URL_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_RAJCE_CLOSE_ALBUM_TRANSACTION_DUMMY_PROPERTY
-};
+PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type,
+                                                                    PublishingRajceSession* session);
+static void _vala_array_add9 (PublishingRajceArgItem** * array,
+                       int* length,
+                       int* size,
+                       PublishingRajceArgItem* value);
+static void _vala_array_add10 (PublishingRajceArgItem** * array,
+                        int* length,
+                        int* size,
+                        PublishingRajceArgItem* value);
+static void _vala_array_add11 (PublishingRajceArgItem** * array,
+                        int* length,
+                        int* size,
+                        PublishingRajceArgItem* value);
+static void _vala_array_add12 (PublishingRajceArgItem** * array,
+                        int* length,
+                        int* size,
+                        PublishingRajceArgItem* value);
+static void _vala_array_add13 (PublishingRajceArgItem** * array,
+                        int* length,
+                        int* size,
+                        PublishingRajceArgItem* value);
 GType publishing_rajce_get_categories_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_RAJCE_GET_CATEGORIES_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
+PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session,
+                                                                                          const gchar* url);
+PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_construct (GType object_type,
+                                                                                                PublishingRajceSession* session,
+                                                                                                const gchar* url);
 #define PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, PublishingRajceAddPhotoTransactionPrivate))
-enum  {
-	PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_DUMMY_PROPERTY
-};
 static void _g_free0_ (gpointer var);
 static void publishing_rajce_add_photo_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);
-
-
-RajceService* rajce_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);
+
+
+RajceService*
+rajce_service_construct (GType object_type,
+                         GFile* resource_directory)
+{
 	RajceService * self = NULL;
 	GdkPixbuf** _tmp0_;
 	gint _tmp0__length1;
@@ -917,7 +1154,7 @@ RajceService* rajce_service_construct (GType object_type, GFile* resource_direct
 	_tmp0__length1 = rajce_service_icon_pixbuf_set_length1;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 921 "RajcePublishing.c"
+#line 1158 "RajcePublishing.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -930,44 +1167,43 @@ RajceService* rajce_service_construct (GType object_type, GFile* resource_direct
 		rajce_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_rajce_service_icon_pixbuf_set_size_ = rajce_service_icon_pixbuf_set_length1;
-#line 934 "RajcePublishing.c"
+#line 1171 "RajcePublishing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 938 "RajcePublishing.c"
+#line 1175 "RajcePublishing.c"
 }
 
 
-RajceService* rajce_service_new (GFile* resource_directory) {
+RajceService*
+rajce_service_new (GFile* resource_directory)
+{
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return rajce_service_construct (TYPE_RAJCE_SERVICE, resource_directory);
-#line 945 "RajcePublishing.c"
+#line 1184 "RajcePublishing.c"
 }
 
 
-static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+rajce_service_real_get_pluggable_interface (SpitPluggable* base,
+                                            gint min_host_interface,
+                                            gint max_host_interface)
+{
 	RajceService * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 967 "RajcePublishing.c"
+#line 1201 "RajcePublishing.c"
 }
 
 
-static const gchar* rajce_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+rajce_service_real_get_id (SpitPluggable* base)
+{
 	RajceService * self;
 	const gchar* result = NULL;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -976,11 +1212,13 @@ static const gchar* rajce_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.rajce";
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 980 "RajcePublishing.c"
+#line 1216 "RajcePublishing.c"
 }
 
 
-static const gchar* rajce_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+rajce_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	RajceService * self;
 	const gchar* result = NULL;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -989,39 +1227,47 @@ static const gchar* rajce_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Rajce";
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 993 "RajcePublishing.c"
+#line 1231 "RajcePublishing.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1000 "RajcePublishing.c"
+#line 1240 "RajcePublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup4 (GdkPixbuf** self,
+                  int length)
+{
 	GdkPixbuf** result;
 	int i;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 1011 "RajcePublishing.c"
+#line 1254 "RajcePublishing.c"
 		GdkPixbuf* _tmp0_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result[i] = _tmp0_;
-#line 1017 "RajcePublishing.c"
+#line 1260 "RajcePublishing.c"
 	}
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1021 "RajcePublishing.c"
+#line 1264 "RajcePublishing.c"
 }
 
 
-static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+rajce_service_real_get_info (SpitPluggable* base,
+                             SpitPluggableInfo* info)
+{
 	RajceService * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -1096,32 +1342,34 @@ static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo*
 	(*info).icons = _tmp8_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*info).icons_length1 = _tmp8__length1;
-#line 1100 "RajcePublishing.c"
+#line 1346 "RajcePublishing.c"
 }
 
 
-static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+rajce_service_real_create_publisher (SpitPublishingService* base,
+                                     SpitPublishingPluginHost* host)
+{
 	RajceService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingRajceRajcePublisher* _tmp1_;
+	PublishingRajceRajcePublisher* _tmp0_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = host;
+	_tmp0_ = publishing_rajce_rajce_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = publishing_rajce_rajce_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1121 "RajcePublishing.c"
+#line 1367 "RajcePublishing.c"
 }
 
 
-static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+rajce_service_real_get_supported_media (SpitPublishingService* base)
+{
 	RajceService * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1130,28 +1378,35 @@ static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media (
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1134 "RajcePublishing.c"
+#line 1382 "RajcePublishing.c"
 }
 
 
-static void rajce_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+rajce_service_real_activation (SpitPluggable* base,
+                               gboolean enabled)
+{
 	RajceService * self;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService);
-#line 1142 "RajcePublishing.c"
+#line 1393 "RajcePublishing.c"
 }
 
 
-static void rajce_service_class_init (RajceServiceClass * klass) {
+static void
+rajce_service_class_init (RajceServiceClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	rajce_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = rajce_service_finalize;
-#line 1151 "RajcePublishing.c"
+#line 1404 "RajcePublishing.c"
 }
 
 
-static void rajce_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+rajce_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	rajce_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1164,36 +1419,44 @@ static void rajce_service_spit_pluggable_interface_init (SpitPluggableIface * if
 	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) rajce_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->activation = (void (*) (SpitPluggable *, gboolean)) rajce_service_real_activation;
-#line 1168 "RajcePublishing.c"
+#line 1423 "RajcePublishing.c"
 }
 
 
-static void rajce_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+rajce_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	rajce_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) rajce_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) rajce_service_real_get_supported_media;
-#line 1179 "RajcePublishing.c"
+#line 1436 "RajcePublishing.c"
 }
 
 
-static void rajce_service_instance_init (RajceService * self) {
+static void
+rajce_service_instance_init (RajceService * self)
+{
 }
 
 
-static void rajce_service_finalize (GObject * obj) {
+static void
+rajce_service_finalize (GObject * obj)
+{
 	RajceService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAJCE_SERVICE, RajceService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (rajce_service_parent_class)->finalize (obj);
-#line 1193 "RajcePublishing.c"
+#line 1454 "RajcePublishing.c"
 }
 
 
-GType rajce_service_get_type (void) {
+GType
+rajce_service_get_type (void)
+{
 	static volatile gsize rajce_service_type_id__volatile = 0;
 	if (g_once_init_enter (&rajce_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (RajceServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rajce_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RajceService), 0, (GInstanceInitFunc) rajce_service_instance_init, NULL };
@@ -1209,16 +1472,17 @@ GType rajce_service_get_type (void) {
 }
 
 
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingRajceRajcePublisher*
+publishing_rajce_rajce_publisher_construct (GType object_type,
+                                            SpitPublishingService* service,
+                                            SpitPublishingPluginHost* host)
+{
 	PublishingRajceRajcePublisher * self = NULL;
 	SpitPublishingService* _tmp0_;
-	SpitPublishingService* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	PublishingRajceSession* _tmp4_;
-	SpitPublishingPluginHost* _tmp5_;
-	gint _tmp6_;
-	SpitPublishingPublishable** _tmp7_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingRajceSession* _tmp2_;
+	gint _tmp3_;
+	SpitPublishingPublishable** _tmp4_;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1228,86 +1492,82 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:86: RajcePublisher created.");
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = service;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (service);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (self->priv->service);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->service = _tmp1_;
+	self->priv->service = _tmp0_;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = host;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (host);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (self->priv->host);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->host = _tmp3_;
+	self->priv->host = _tmp1_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishing_rajce_session_new ();
+	_tmp2_ = publishing_rajce_session_new ();
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->session = _tmp4_;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = host;
+	self->priv->session = _tmp2_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = spit_publishing_plugin_host_get_publishables (_tmp5_, &_tmp6_);
-#line 1257 "RajcePublishing.c"
+	_tmp4_ = spit_publishing_plugin_host_get_publishables (host, &_tmp3_);
+#line 1515 "RajcePublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		p_collection = _tmp7_;
+		p_collection = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		p_collection_length1 = _tmp6_;
+		p_collection_length1 = _tmp3_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		for (p_it = 0; p_it < _tmp6_; p_it = p_it + 1) {
-#line 1269 "RajcePublishing.c"
-			SpitPublishingPublishable* _tmp8_;
+		for (p_it = 0; p_it < _tmp3_; p_it = p_it + 1) {
+#line 1527 "RajcePublishing.c"
+			SpitPublishingPublishable* _tmp5_;
 			SpitPublishingPublishable* p = NULL;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp8_ = _g_object_ref0 (p_collection[p_it]);
+			_tmp5_ = _g_object_ref0 (p_collection[p_it]);
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			p = _tmp8_;
-#line 1276 "RajcePublishing.c"
+			p = _tmp5_;
+#line 1534 "RajcePublishing.c"
 			{
-				SpitPublishingPublisherMediaType _tmp9_;
-				SpitPublishingPublishable* _tmp10_;
-				SpitPublishingPublisherMediaType _tmp11_;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp9_ = self->priv->media_type;
+				SpitPublishingPublisherMediaType _tmp6_;
+				SpitPublishingPublishable* _tmp7_;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp10_ = p;
+				_tmp6_ = self->priv->media_type;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp11_ = spit_publishing_publishable_get_media_type (_tmp10_);
+				_tmp7_ = p;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				self->priv->media_type = _tmp9_ | _tmp11_;
+				self->priv->media_type = _tmp6_ | spit_publishing_publishable_get_media_type (_tmp7_);
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_g_object_unref0 (p);
-#line 1291 "RajcePublishing.c"
+#line 1546 "RajcePublishing.c"
 			}
 		}
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1296 "RajcePublishing.c"
+#line 1551 "RajcePublishing.c"
 	}
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 1300 "RajcePublishing.c"
+#line 1555 "RajcePublishing.c"
 }
 
 
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingRajceRajcePublisher*
+publishing_rajce_rajce_publisher_new (SpitPublishingService* service,
+                                      SpitPublishingPluginHost* host)
+{
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_rajce_publisher_construct (PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, service, host);
-#line 1307 "RajcePublishing.c"
+#line 1565 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self) {
+static gchar*
+publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1318,11 +1578,13 @@ static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRaj
 	result = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1322 "RajcePublishing.c"
+#line 1582 "RajcePublishing.c"
 }
 
 
-static SpitPublishingService* publishing_rajce_rajce_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_rajce_rajce_publisher_real_get_service (SpitPublishingPublisher* base)
+{
 	PublishingRajceRajcePublisher * self;
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
@@ -1337,11 +1599,13 @@ static SpitPublishingService* publishing_rajce_rajce_publisher_real_get_service
 	result = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1341 "RajcePublishing.c"
+#line 1603 "RajcePublishing.c"
 }
 
 
-SpitPublishingPluginHost* publishing_rajce_rajce_publisher_get_host (PublishingRajceRajcePublisher* self) {
+SpitPublishingPluginHost*
+publishing_rajce_rajce_publisher_get_host (PublishingRajceRajcePublisher* self)
+{
 	SpitPublishingPluginHost* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
@@ -1355,11 +1619,13 @@ SpitPublishingPluginHost* publishing_rajce_rajce_publisher_get_host (PublishingR
 	result = _tmp1_;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1359 "RajcePublishing.c"
+#line 1623 "RajcePublishing.c"
 }
 
 
-static gboolean publishing_rajce_rajce_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_rajce_rajce_publisher_real_is_running (SpitPublishingPublisher* base)
+{
 	PublishingRajceRajcePublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -1371,11 +1637,13 @@ static gboolean publishing_rajce_rajce_publisher_real_is_running (SpitPublishing
 	result = _tmp0_;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1375 "RajcePublishing.c"
+#line 1641 "RajcePublishing.c"
 }
 
 
-static gboolean* _bool_dup (gboolean* self) {
+static gboolean*
+_bool_dup (gboolean* self)
+{
 	gboolean* dup;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	dup = g_new0 (gboolean, 1);
@@ -1383,109 +1651,107 @@ static gboolean* _bool_dup (gboolean* self) {
 	memcpy (dup, self, sizeof (gboolean));
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return dup;
-#line 1387 "RajcePublishing.c"
+#line 1655 "RajcePublishing.c"
 }
 
 
-static gpointer __bool_dup0 (gpointer self) {
+static gpointer
+__bool_dup0 (gpointer self)
+{
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? _bool_dup (self) : NULL;
-#line 1394 "RajcePublishing.c"
+#line 1664 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher* base)
+{
 	PublishingRajceRajcePublisher * self;
-	gboolean _tmp0_;
-	PublishingRajceSession* _tmp1_;
-	gboolean _tmp2_;
+	PublishingRajceSession* _tmp0_;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp0_) {
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 1411 "RajcePublishing.c"
+#line 1679 "RajcePublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:111: RajcePublisher: start");
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->running = TRUE;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = self->priv->session;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp2_) {
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:116: RajcePublisher: session is authenticated.");
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_rajce_publisher_do_fetch_albums (self);
-#line 1427 "RajcePublishing.c"
+#line 1693 "RajcePublishing.c"
 	} else {
 		gchar* persistent_username = NULL;
-		gchar* _tmp3_;
+		gchar* _tmp1_;
 		gchar* persistent_token = NULL;
-		gchar* _tmp4_;
+		gchar* _tmp2_;
 		gboolean* persistent_remember = NULL;
-		gboolean _tmp5_;
-		gboolean* _tmp6_;
-		gboolean _tmp7_ = FALSE;
-		const gchar* _tmp8_;
+		gboolean _tmp3_;
+		gboolean* _tmp4_;
+		gboolean _tmp5_ = FALSE;
+		const gchar* _tmp6_;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:121: RajcePublisher: session is not authenticated" \
 ".");
 #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3_ = publishing_rajce_rajce_publisher_get_username (self);
+		_tmp1_ = publishing_rajce_rajce_publisher_get_username (self);
 #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		persistent_username = _tmp3_;
+		persistent_username = _tmp1_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = publishing_rajce_rajce_publisher_get_token (self);
+		_tmp2_ = publishing_rajce_rajce_publisher_get_token (self);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		persistent_token = _tmp4_;
+		persistent_token = _tmp2_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp5_ = publishing_rajce_rajce_publisher_get_remember (self);
+		_tmp3_ = publishing_rajce_rajce_publisher_get_remember (self);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp6_ = __bool_dup0 (&_tmp5_);
+		_tmp4_ = __bool_dup0 (&_tmp3_);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		persistent_remember = _tmp6_;
+		persistent_remember = _tmp4_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = persistent_username;
+		_tmp6_ = persistent_username;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp8_ != NULL) {
-#line 1458 "RajcePublishing.c"
-			const gchar* _tmp9_;
+		if (_tmp6_ != NULL) {
+#line 1724 "RajcePublishing.c"
+			const gchar* _tmp7_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp9_ = persistent_token;
+			_tmp7_ = persistent_token;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp7_ = _tmp9_ != NULL;
-#line 1464 "RajcePublishing.c"
+			_tmp5_ = _tmp7_ != NULL;
+#line 1730 "RajcePublishing.c"
 		} else {
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp7_ = FALSE;
-#line 1468 "RajcePublishing.c"
+			_tmp5_ = FALSE;
+#line 1734 "RajcePublishing.c"
 		}
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp7_) {
-#line 1472 "RajcePublishing.c"
-			const gchar* _tmp10_;
-			const gchar* _tmp11_;
-			gboolean* _tmp12_;
+		if (_tmp5_) {
+#line 1738 "RajcePublishing.c"
+			const gchar* _tmp8_;
+			const gchar* _tmp9_;
+			gboolean* _tmp10_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp10_ = persistent_username;
+			_tmp8_ = persistent_username;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp11_ = persistent_token;
+			_tmp9_ = persistent_token;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp12_ = persistent_remember;
+			_tmp10_ = persistent_remember;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			publishing_rajce_rajce_publisher_do_network_login (self, _tmp10_, _tmp11_, *_tmp12_);
-#line 1484 "RajcePublishing.c"
+			publishing_rajce_rajce_publisher_do_network_login (self, _tmp8_, _tmp9_, *_tmp10_);
+#line 1750 "RajcePublishing.c"
 		} else {
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO);
-#line 1488 "RajcePublishing.c"
+#line 1754 "RajcePublishing.c"
 		}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (persistent_remember);
@@ -1493,12 +1759,14 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher
 		_g_free0 (persistent_token);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (persistent_username);
-#line 1496 "RajcePublishing.c"
+#line 1762 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher* base)
+{
 	PublishingRajceRajcePublisher * self;
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
@@ -1506,11 +1774,13 @@ static void publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher*
 	g_debug ("RajcePublishing.vala:134: RajcePublisher: stop");
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->running = FALSE;
-#line 1509 "RajcePublishing.c"
+#line 1777 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self) {
+gchar*
+publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1521,11 +1791,13 @@ gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher*
 	result = _tmp0_;
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1524 "RajcePublishing.c"
+#line 1794 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublisher* self) {
+gchar*
+publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -1539,13 +1811,15 @@ gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublis
 	result = _tmp1_;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1542 "RajcePublishing.c"
+#line 1814 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self, const gchar* username) {
+static void
+publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self,
+                                               const gchar* username)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1553,14 +1827,14 @@ static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajceP
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = username;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 1559 "RajcePublishing.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", username);
+#line 1831 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self) {
+gchar*
+publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -1574,143 +1848,148 @@ gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher
 	result = _tmp1_;
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1577 "RajcePublishing.c"
+#line 1851 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self, const gchar* token) {
+static void
+publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self,
+                                            const gchar* token)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = token;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", _tmp1_);
-#line 1592 "RajcePublishing.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", token);
+#line 1866 "RajcePublishing.c"
 }
 
 
-gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self) {
+gboolean
+publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE);
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", FALSE);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", FALSE);
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1610 "RajcePublishing.c"
+#line 1883 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self, gboolean remember) {
+static void
+publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self,
+                                               gboolean remember)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = remember;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", _tmp1_);
-#line 1625 "RajcePublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", remember);
+#line 1898 "RajcePublishing.c"
 }
 
 
-gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self) {
+gboolean
+publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE);
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", FALSE);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", FALSE);
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1643 "RajcePublishing.c"
+#line 1915 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self, gboolean hide_album) {
+void
+publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self,
+                                                 gboolean hide_album)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = hide_album;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", _tmp1_);
-#line 1658 "RajcePublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", hide_album);
+#line 1930 "RajcePublishing.c"
 }
 
 
-gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self) {
+gboolean
+publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", TRUE);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", TRUE);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1676 "RajcePublishing.c"
+#line 1947 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self, gboolean show_album) {
+void
+publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self,
+                                                 gboolean show_album)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = show_album;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", _tmp1_);
-#line 1691 "RajcePublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", show_album);
+#line 1962 "RajcePublishing.c"
 }
 
 
 /**
      * Action that shows the authentication pane.
      */
-static void _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender, const gchar* user, const gchar* token, gboolean remember, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender,
+                                                                                                                   const gchar* user,
+                                                                                                                   const gchar* token,
+                                                                                                                   gboolean remember,
+                                                                                                                   gpointer self)
+{
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked ((PublishingRajceRajcePublisher*) self, user, token, remember);
-#line 1701 "RajcePublishing.c"
+#line 1978 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self, PublishingRajceAuthenticationPaneMode mode) {
+static void
+publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self,
+                                                              PublishingRajceAuthenticationPaneMode mode)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajceAuthenticationPane* authentication_pane = NULL;
-	PublishingRajceAuthenticationPaneMode _tmp1_;
-	PublishingRajceAuthenticationPane* _tmp2_;
+	PublishingRajceAuthenticationPane* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
 	SpitPublishingPluginHost* _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
+	GtkWidget* _tmp4_;
 	GtkWidget* _tmp5_;
-	GtkWidget* _tmp6_;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1720,41 +1999,41 @@ static void publishing_rajce_rajce_publisher_do_show_authentication_pane (Publis
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
 #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = mode;
+	_tmp1_ = publishing_rajce_authentication_pane_new (self, mode);
 #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_authentication_pane_new (self, _tmp1_);
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	authentication_pane = _tmp2_;
+	authentication_pane = _tmp1_;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login, self, 0);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = self->priv->host;
+	_tmp2_ = self->priv->host;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = self->priv->host;
+	_tmp3_ = self->priv->host;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = publishing_rajce_authentication_pane_get_default_widget (authentication_pane);
+	_tmp4_ = publishing_rajce_authentication_pane_get_default_widget (authentication_pane);
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp3_, _tmp5_);
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 1746 "RajcePublishing.c"
+#line 2023 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the login button in the authentication panel is clicked.
      */
-static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember) {
+static void
+publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self,
+                                                                       const gchar* username,
+                                                                       const gchar* token,
+                                                                       gboolean remember)
+{
 	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1769,52 +2048,53 @@ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicke
 	if (!_tmp0_) {
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 1772 "RajcePublishing.c"
+#line 2051 "RajcePublishing.c"
 	}
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = username;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = token;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = remember;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_);
-#line 1782 "RajcePublishing.c"
+	publishing_rajce_rajce_publisher_do_network_login (self, username, token, remember);
+#line 2055 "RajcePublishing.c"
 }
 
 
 /**
      * Action to perform a network login to a Rajce service.
      */
-static void _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                            GError* err,
+                                                                                                            gpointer self)
+{
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_login_network_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 1792 "RajcePublishing.c"
+#line 2069 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                           gpointer self)
+{
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_login_network_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 1799 "RajcePublishing.c"
+#line 2079 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember) {
+static void
+publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self,
+                                                   const gchar* username,
+                                                   const gchar* token,
+                                                   gboolean remember)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-	gboolean _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_;
+	const gchar* _tmp2_ = NULL;
 	PublishingRajceSessionLoginTransaction* login_trans = NULL;
-	PublishingRajceSession* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	const gchar* _tmp10_;
-	const gchar* _tmp11_;
-	PublishingRajceSessionLoginTransaction* _tmp12_;
-	PublishingRajceSessionLoginTransaction* _tmp13_;
+	PublishingRajceSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingRajceSessionLoginTransaction* _tmp6_;
+	PublishingRajceSessionLoginTransaction* _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -1833,54 +2113,40 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = remember;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_set_remember (self, _tmp2_);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = username;
+	publishing_rajce_rajce_publisher_set_remember (self, remember);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_set_username (self, _tmp3_);
+	publishing_rajce_rajce_publisher_set_username (self, username);
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = remember;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp5_) {
-#line 1847 "RajcePublishing.c"
-		const gchar* _tmp6_;
+	if (remember) {
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp6_ = token;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = _tmp6_;
-#line 1853 "RajcePublishing.c"
+		_tmp2_ = token;
+#line 2123 "RajcePublishing.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = NULL;
-#line 1857 "RajcePublishing.c"
+		_tmp2_ = NULL;
+#line 2127 "RajcePublishing.c"
 	}
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_set_token (self, _tmp4_);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = self->priv->session;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = publishing_rajce_rajce_publisher_get_url (self);
+	publishing_rajce_rajce_publisher_set_token (self, _tmp2_);
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp3_ = self->priv->session;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = username;
+	_tmp4_ = publishing_rajce_rajce_publisher_get_url (self);
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11_ = token;
+	_tmp5_ = _tmp4_;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp12_ = publishing_rajce_session_login_transaction_new (_tmp7_, _tmp9_, _tmp10_, _tmp11_);
+	_tmp6_ = publishing_rajce_session_login_transaction_new (_tmp3_, _tmp5_, username, token);
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp13_ = _tmp12_;
+	_tmp7_ = _tmp6_;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp5_);
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	login_trans = _tmp13_;
+	login_trans = _tmp7_;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1883 "RajcePublishing.c"
+#line 2149 "RajcePublishing.c"
 	{
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1888,7 +2154,7 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1891 "RajcePublishing.c"
+#line 2157 "RajcePublishing.c"
 				goto __catch16_spit_publishing_publishing_error;
 			}
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1899,14 +2165,14 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 			g_clear_error (&_inner_error_);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 1902 "RajcePublishing.c"
+#line 2168 "RajcePublishing.c"
 		}
 	}
 	goto __finally16;
 	__catch16_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp14_;
+		GError* _tmp8_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1914,12 +2180,12 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:203: ERROR: do_network_login");
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = err;
+		_tmp8_ = err;
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_rajce_publisher_do_show_error (self, _tmp14_);
+		publishing_rajce_rajce_publisher_do_show_error (self, _tmp8_);
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
-#line 1922 "RajcePublishing.c"
+#line 2188 "RajcePublishing.c"
 	}
 	__finally16:
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1932,31 +2198,35 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 		g_clear_error (&_inner_error_);
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 1935 "RajcePublishing.c"
+#line 2201 "RajcePublishing.c"
 	}
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (login_trans);
-#line 1939 "RajcePublishing.c"
+#line 2205 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the network login action is complete and successful.
      */
-static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                          gpointer self)
+{
 	gchar* result;
 	result = publishing_rajce_transaction_validate_xml (doc);
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1951 "RajcePublishing.c"
+#line 2220 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self,
+                                                            PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -1965,93 +2235,83 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 #line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:213: EVENT: on_login_network_complete");
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 1979 "RajcePublishing.c"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
+#line 2245 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-		PublishingRESTSupportXmlDocument* _tmp7_;
-		PublishingRESTSupportXmlDocument* _tmp8_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		PublishingRESTSupportXmlDocument* _tmp4_;
+		PublishingRESTSupportXmlDocument* _tmp5_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp9_;
-		xmlNode* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		xmlNode* _tmp7_;
 		xmlNode* sessionToken = NULL;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		xmlNode* _tmp10_;
+		xmlNode* maxWidth = NULL;
 		PublishingRESTSupportXmlDocument* _tmp11_;
 		xmlNode* _tmp12_;
 		xmlNode* _tmp13_;
-		xmlNode* maxWidth = NULL;
+		xmlNode* maxHeight = NULL;
 		PublishingRESTSupportXmlDocument* _tmp14_;
 		xmlNode* _tmp15_;
 		xmlNode* _tmp16_;
-		xmlNode* maxHeight = NULL;
+		xmlNode* quality = NULL;
 		PublishingRESTSupportXmlDocument* _tmp17_;
 		xmlNode* _tmp18_;
 		xmlNode* _tmp19_;
-		xmlNode* quality = NULL;
+		xmlNode* nick = NULL;
 		PublishingRESTSupportXmlDocument* _tmp20_;
 		xmlNode* _tmp21_;
 		xmlNode* _tmp22_;
-		xmlNode* nick = NULL;
-		PublishingRESTSupportXmlDocument* _tmp23_;
-		xmlNode* _tmp24_;
-		xmlNode* _tmp25_;
 		gint maxW = 0;
-		xmlNode* _tmp26_;
-		gchar* _tmp27_;
+		xmlNode* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		gint _tmp26_;
+		gint maxH = 0;
+		xmlNode* _tmp27_;
 		gchar* _tmp28_;
-		gint _tmp29_;
+		gchar* _tmp29_;
 		gint _tmp30_;
-		gint maxH = 0;
-		xmlNode* _tmp31_;
-		gchar* _tmp32_;
-		gchar* _tmp33_;
-		gint _tmp34_;
-		gint _tmp35_;
-		gint _tmp36_;
-		gint _tmp37_;
-		PublishingRajceSession* _tmp39_;
-		xmlNode* _tmp40_;
-		gchar* _tmp41_;
-		gchar* _tmp42_;
-		xmlNode* _tmp43_;
+		gint _tmp31_;
+		gint _tmp32_;
+		PublishingRajceSession* _tmp34_;
+		xmlNode* _tmp35_;
+		gchar* _tmp36_;
+		gchar* _tmp37_;
+		xmlNode* _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		gint _tmp41_;
+		xmlNode* _tmp42_;
+		gchar* _tmp43_;
 		gchar* _tmp44_;
-		gchar* _tmp45_;
-		gint _tmp46_;
-		xmlNode* _tmp47_;
-		gchar* _tmp48_;
-		gchar* _tmp49_;
-		gint _tmp50_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = txn;
+		_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+		_tmp3_ = _tmp2_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp5_ = _tmp4_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = _tmp7_;
+		_g_free0 (_tmp3_);
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp6_);
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		doc = _tmp8_;
+		doc = _tmp5_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2054 "RajcePublishing.c"
+#line 2314 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2060,29 +2320,29 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2063 "RajcePublishing.c"
+#line 2323 "RajcePublishing.c"
 		}
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = doc;
+		_tmp6_ = doc;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
+		_tmp7_ = publishing_rest_support_xml_document_get_root_node (_tmp6_);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		response = _tmp10_;
+		response = _tmp7_;
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = doc;
+		_tmp8_ = doc;
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = response;
+		_tmp9_ = response;
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
+		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "sessionToken", &_inner_error_);
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		sessionToken = _tmp13_;
+		sessionToken = _tmp10_;
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2085 "RajcePublishing.c"
+#line 2345 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2093,23 +2353,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2096 "RajcePublishing.c"
+#line 2356 "RajcePublishing.c"
 		}
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = doc;
+		_tmp11_ = doc;
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = response;
+		_tmp12_ = response;
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = publishing_rest_support_xml_document_get_named_child (_tmp14_, _tmp15_, "maxWidth", &_inner_error_);
+		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "maxWidth", &_inner_error_);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		maxWidth = _tmp16_;
+		maxWidth = _tmp13_;
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2112 "RajcePublishing.c"
+#line 2372 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2120,23 +2380,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2123 "RajcePublishing.c"
+#line 2383 "RajcePublishing.c"
 		}
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = doc;
+		_tmp14_ = doc;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = response;
+		_tmp15_ = response;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = publishing_rest_support_xml_document_get_named_child (_tmp17_, _tmp18_, "maxHeight", &_inner_error_);
+		_tmp16_ = publishing_rest_support_xml_document_get_named_child (_tmp14_, _tmp15_, "maxHeight", &_inner_error_);
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		maxHeight = _tmp19_;
+		maxHeight = _tmp16_;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2139 "RajcePublishing.c"
+#line 2399 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2147,23 +2407,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2150 "RajcePublishing.c"
+#line 2410 "RajcePublishing.c"
 		}
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = doc;
+		_tmp17_ = doc;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = response;
+		_tmp18_ = response;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "quality", &_inner_error_);
+		_tmp19_ = publishing_rest_support_xml_document_get_named_child (_tmp17_, _tmp18_, "quality", &_inner_error_);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		quality = _tmp22_;
+		quality = _tmp19_;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2166 "RajcePublishing.c"
+#line 2426 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2174,23 +2434,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2177 "RajcePublishing.c"
+#line 2437 "RajcePublishing.c"
 		}
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp23_ = doc;
+		_tmp20_ = doc;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp24_ = response;
+		_tmp21_ = response;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp25_ = publishing_rest_support_xml_document_get_named_child (_tmp23_, _tmp24_, "nick", &_inner_error_);
+		_tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "nick", &_inner_error_);
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		nick = _tmp25_;
+		nick = _tmp22_;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2193 "RajcePublishing.c"
+#line 2453 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2201,131 +2461,122 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2204 "RajcePublishing.c"
+#line 2464 "RajcePublishing.c"
 		}
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = maxWidth;
+		_tmp23_ = maxWidth;
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = (gchar*) xmlNodeGetContent (_tmp26_);
+		_tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_ = _tmp27_;
+		_tmp25_ = _tmp24_;
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp29_ = atoi (_tmp28_);
+		_tmp26_ = atoi (_tmp25_);
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp30_ = _tmp29_;
+		_g_free0 (_tmp25_);
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp28_);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		maxW = _tmp30_;
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp31_ = maxHeight;
+		maxW = _tmp26_;
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp32_ = (gchar*) xmlNodeGetContent (_tmp31_);
+		_tmp27_ = maxHeight;
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp33_ = _tmp32_;
+		_tmp28_ = (gchar*) xmlNodeGetContent (_tmp27_);
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp34_ = atoi (_tmp33_);
+		_tmp29_ = _tmp28_;
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp35_ = _tmp34_;
+		_tmp30_ = atoi (_tmp29_);
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp33_);
+		_g_free0 (_tmp29_);
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		maxH = _tmp35_;
+		maxH = _tmp30_;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp36_ = maxW;
+		_tmp31_ = maxW;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp37_ = maxH;
+		_tmp32_ = maxH;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp36_ > _tmp37_) {
-#line 2240 "RajcePublishing.c"
-			gint _tmp38_;
+		if (_tmp31_ > _tmp32_) {
+#line 2496 "RajcePublishing.c"
+			gint _tmp33_;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp38_ = maxW;
+			_tmp33_ = maxW;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			maxH = _tmp38_;
-#line 2246 "RajcePublishing.c"
+			maxH = _tmp33_;
+#line 2502 "RajcePublishing.c"
 		}
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp39_ = self->priv->session;
+		_tmp34_ = self->priv->session;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp40_ = sessionToken;
+		_tmp35_ = sessionToken;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp41_ = (gchar*) xmlNodeGetContent (_tmp40_);
+		_tmp36_ = (gchar*) xmlNodeGetContent (_tmp35_);
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp42_ = _tmp41_;
+		_tmp37_ = _tmp36_;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp43_ = nick;
+		_tmp38_ = nick;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp44_ = (gchar*) xmlNodeGetContent (_tmp43_);
+		_tmp39_ = (gchar*) xmlNodeGetContent (_tmp38_);
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp45_ = _tmp44_;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp46_ = maxH;
+		_tmp40_ = _tmp39_;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp47_ = quality;
+		_tmp41_ = maxH;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp48_ = (gchar*) xmlNodeGetContent (_tmp47_);
+		_tmp42_ = quality;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp49_ = _tmp48_;
+		_tmp43_ = (gchar*) xmlNodeGetContent (_tmp42_);
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp50_ = atoi (_tmp49_);
+		_tmp44_ = _tmp43_;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_authenticate (_tmp39_, _tmp42_, _tmp45_, 0, _tmp46_, _tmp50_);
+		publishing_rajce_session_authenticate (_tmp34_, _tmp37_, _tmp40_, 0, _tmp41_, atoi (_tmp44_));
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp49_);
+		_g_free0 (_tmp44_);
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp45_);
+		_g_free0 (_tmp40_);
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp42_);
+		_g_free0 (_tmp37_);
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 2282 "RajcePublishing.c"
+#line 2536 "RajcePublishing.c"
 	}
 	goto __finally17;
 	__catch17_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gint code_int = 0;
-		GError* _tmp51_;
-		const gchar* _tmp52_;
-		gint _tmp53_;
-		gint _tmp54_;
+		GError* _tmp45_;
+		const gchar* _tmp46_;
+		gint _tmp47_;
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_inner_error_ = NULL;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp51_ = err;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp52_ = _tmp51_->message;
+		_tmp45_ = err;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp53_ = atoi (_tmp52_);
+		_tmp46_ = _tmp45_->message;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		code_int = _tmp53_;
+		code_int = atoi (_tmp46_);
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp54_ = code_int;
+		_tmp47_ = code_int;
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp54_ == 999) {
+		if (_tmp47_ == 999) {
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			g_debug ("RajcePublishing.vala:239: ERROR: on_login_network_complete, code 999");
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 2313 "RajcePublishing.c"
+#line 2564 "RajcePublishing.c"
 		} else {
-			GError* _tmp55_;
+			GError* _tmp48_;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			g_debug ("RajcePublishing.vala:244: ERROR: on_login_network_complete");
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp55_ = err;
+			_tmp48_ = err;
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			publishing_rajce_rajce_publisher_do_show_error (self, _tmp55_);
-#line 2322 "RajcePublishing.c"
+			publishing_rajce_rajce_publisher_do_show_error (self, _tmp48_);
+#line 2573 "RajcePublishing.c"
 		}
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 2328 "RajcePublishing.c"
+#line 2579 "RajcePublishing.c"
 	}
 	__finally17:
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2336,22 +2587,24 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 		g_clear_error (&_inner_error_);
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 2339 "RajcePublishing.c"
+#line 2590 "RajcePublishing.c"
 	}
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_fetch_albums (self);
-#line 2343 "RajcePublishing.c"
+#line 2594 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when a network login action fails due to a network error.
      */
-static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self,
+                                                         PublishingRESTSupportTransaction* bad_txn,
+                                                         GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2359,41 +2612,46 @@ static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingR
 #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:257: EVENT: on_login_network_error");
 #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = bad_txn;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_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_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_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_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 2375 "RajcePublishing.c"
+#line 2624 "RajcePublishing.c"
 }
 
 
 /**
      * Action that fetches all user albums from the Rajce.
      */
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                           GError* err,
+                                                                                                           gpointer self)
+{
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_albums_fetch_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 2385 "RajcePublishing.c"
+#line 2638 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                          gpointer self)
+{
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_albums_fetch_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 2392 "RajcePublishing.c"
+#line 2648 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRajcePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingRajceGetAlbumsTransaction* get_albums_trans = NULL;
@@ -2433,7 +2691,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2436 "RajcePublishing.c"
+#line 2694 "RajcePublishing.c"
 	{
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2441,7 +2699,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2444 "RajcePublishing.c"
+#line 2702 "RajcePublishing.c"
 				goto __catch18_spit_publishing_publishing_error;
 			}
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2452,7 +2710,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
 			g_clear_error (&_inner_error_);
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2455 "RajcePublishing.c"
+#line 2713 "RajcePublishing.c"
 		}
 	}
 	goto __finally18;
@@ -2472,7 +2730,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
 		publishing_rajce_rajce_publisher_do_show_error (self, _tmp7_);
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
-#line 2475 "RajcePublishing.c"
+#line 2733 "RajcePublishing.c"
 	}
 	__finally18:
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2485,38 +2743,42 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
 		g_clear_error (&_inner_error_);
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 2488 "RajcePublishing.c"
+#line 2746 "RajcePublishing.c"
 	}
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (get_albums_trans);
-#line 2492 "RajcePublishing.c"
+#line 2750 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the fetch albums action completes successfully.
      */
-static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a,
+                                                           gconstpointer b,
+                                                           gpointer self)
+{
 	gint result;
 	result = publishing_rajce_album_compare_albums ((PublishingRajceAlbum*) a, (PublishingRajceAlbum*) b);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 2504 "RajcePublishing.c"
+#line 2766 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self,
+                                                           PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	PublishingRajceAlbum** _tmp7_;
-	gint _tmp7__length1;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRajceAlbum** _tmp4_;
+	gint _tmp4__length1;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp8_;
+	GeeArrayList* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -2525,33 +2787,27 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:292: EVENT: on_albums_fetch_complete");
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = txn;
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:295: RajcePlugin: list of albums: %s", _tmp6_);
+	g_debug ("RajcePublishing.vala:295: RajcePlugin: list of albums: %s", _tmp3_);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp3_);
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = self->priv->albums;
+	_tmp4_ = self->priv->albums;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7__length1 = self->priv->albums_length1;
+	_tmp4__length1 = self->priv->albums_length1;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp7_ != NULL) {
+	if (_tmp4_ != NULL) {
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2560,58 +2816,55 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 		self->priv->albums_length1 = 0;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		self->priv->_albums_size_ = self->priv->albums_length1;
-#line 2563 "RajcePublishing.c"
+#line 2819 "RajcePublishing.c"
 	}
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = gee_array_list_new (PUBLISHING_RAJCE_TYPE_ALBUM, (GBoxedCopyFunc) publishing_rajce_album_ref, (GDestroyNotify) publishing_rajce_album_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (PUBLISHING_RAJCE_TYPE_ALBUM, (GBoxedCopyFunc) publishing_rajce_album_ref, (GDestroyNotify) publishing_rajce_album_unref, NULL, NULL, NULL);
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	list = _tmp8_;
-#line 2569 "RajcePublishing.c"
+	list = _tmp5_;
+#line 2825 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
-		PublishingRESTSupportXmlDocument* _tmp12_;
-		PublishingRESTSupportXmlDocument* _tmp13_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		PublishingRESTSupportXmlDocument* _tmp9_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp14_;
-		xmlNode* _tmp15_;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		xmlNode* _tmp11_;
 		xmlNode* sessionToken = NULL;
-		PublishingRESTSupportXmlDocument* _tmp16_;
-		xmlNode* _tmp17_;
-		xmlNode* _tmp18_;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
+		xmlNode* _tmp14_;
 		xmlNode* nodealbums = NULL;
-		PublishingRESTSupportXmlDocument* _tmp19_;
-		xmlNode* _tmp20_;
-		xmlNode* _tmp21_;
-		GeeArrayList* _tmp96_;
-		GeeArrayList* _tmp97_;
-		gint _tmp98_;
-		gpointer* _tmp99_;
-		PublishingRajceSession* _tmp100_;
-		xmlNode* _tmp101_;
-		gchar* _tmp102_;
-		gchar* _tmp103_;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = txn;
+		PublishingRESTSupportXmlDocument* _tmp15_;
+		xmlNode* _tmp16_;
+		xmlNode* _tmp17_;
+		GeeArrayList* _tmp88_;
+		GeeArrayList* _tmp89_;
+		gint _tmp90_;
+		gpointer* _tmp91_;
+		PublishingRajceSession* _tmp92_;
+		xmlNode* _tmp93_;
+		gchar* _tmp94_;
+		gchar* _tmp95_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = publishing_rest_support_transaction_get_response (_tmp9_);
+		_tmp6_ = publishing_rest_support_transaction_get_response (txn);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = _tmp10_;
+		_tmp7_ = _tmp6_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = publishing_rest_support_xml_document_parse_string (_tmp11_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp8_ = publishing_rest_support_xml_document_parse_string (_tmp7_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = _tmp12_;
+		_tmp9_ = _tmp8_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp11_);
+		_g_free0 (_tmp7_);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		doc = _tmp13_;
+		doc = _tmp9_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2614 "RajcePublishing.c"
+#line 2867 "RajcePublishing.c"
 				goto __catch19_spit_publishing_publishing_error;
 			}
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2622,29 +2875,29 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 			g_clear_error (&_inner_error_);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2625 "RajcePublishing.c"
+#line 2878 "RajcePublishing.c"
 		}
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = doc;
+		_tmp10_ = doc;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = publishing_rest_support_xml_document_get_root_node (_tmp14_);
+		_tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		response = _tmp15_;
+		response = _tmp11_;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = doc;
+		_tmp12_ = doc;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = response;
+		_tmp13_ = response;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "sessionToken", &_inner_error_);
+		_tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "sessionToken", &_inner_error_);
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		sessionToken = _tmp18_;
+		sessionToken = _tmp14_;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2647 "RajcePublishing.c"
+#line 2900 "RajcePublishing.c"
 				goto __catch19_spit_publishing_publishing_error;
 			}
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2657,23 +2910,23 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 			g_clear_error (&_inner_error_);
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2660 "RajcePublishing.c"
+#line 2913 "RajcePublishing.c"
 		}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = doc;
+		_tmp15_ = doc;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = response;
+		_tmp16_ = response;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = publishing_rest_support_xml_document_get_named_child (_tmp19_, _tmp20_, "albums", &_inner_error_);
+		_tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "albums", &_inner_error_);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		nodealbums = _tmp21_;
+		nodealbums = _tmp17_;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2676 "RajcePublishing.c"
+#line 2929 "RajcePublishing.c"
 				goto __catch19_spit_publishing_publishing_error;
 			}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2686,156 +2939,150 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 			g_clear_error (&_inner_error_);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 2689 "RajcePublishing.c"
+#line 2942 "RajcePublishing.c"
 		}
 		{
 			xmlNode* album = NULL;
-			xmlNode* _tmp22_;
-			xmlNode* _tmp23_;
+			xmlNode* _tmp18_;
+			xmlNode* _tmp19_;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp22_ = nodealbums;
+			_tmp18_ = nodealbums;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp23_ = _tmp22_->children;
+			_tmp19_ = _tmp18_->children;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			album = _tmp23_;
-#line 2701 "RajcePublishing.c"
+			album = _tmp19_;
+#line 2954 "RajcePublishing.c"
 			{
-				gboolean _tmp24_ = FALSE;
+				gboolean _tmp20_ = FALSE;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp24_ = TRUE;
+				_tmp20_ = TRUE;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				while (TRUE) {
-#line 2708 "RajcePublishing.c"
-					xmlNode* _tmp27_;
+#line 2961 "RajcePublishing.c"
+					xmlNode* _tmp23_;
 					gint id = 0;
-					xmlNode* _tmp28_;
-					gchar* _tmp29_;
-					gchar* _tmp30_;
-					gint _tmp31_;
-					gint _tmp32_;
+					xmlNode* _tmp24_;
+					gchar* _tmp25_;
+					gchar* _tmp26_;
+					gint _tmp27_;
+					xmlNode* _tmp28_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp29_;
+					xmlNode* _tmp30_;
+					xmlNode* _tmp31_;
+					gchar* albumName = NULL;
+					gchar* _tmp32_;
 					xmlNode* _tmp33_ = NULL;
 					PublishingRESTSupportXmlDocument* _tmp34_;
 					xmlNode* _tmp35_;
 					xmlNode* _tmp36_;
-					gchar* albumName = NULL;
+					gchar* url = NULL;
 					gchar* _tmp37_;
 					xmlNode* _tmp38_ = NULL;
 					PublishingRESTSupportXmlDocument* _tmp39_;
 					xmlNode* _tmp40_;
 					xmlNode* _tmp41_;
-					gchar* url = NULL;
+					gchar* thumbUrl = NULL;
 					gchar* _tmp42_;
 					xmlNode* _tmp43_ = NULL;
 					PublishingRESTSupportXmlDocument* _tmp44_;
 					xmlNode* _tmp45_;
 					xmlNode* _tmp46_;
-					gchar* thumbUrl = NULL;
+					gchar* createDate = NULL;
 					gchar* _tmp47_;
 					xmlNode* _tmp48_ = NULL;
 					PublishingRESTSupportXmlDocument* _tmp49_;
 					xmlNode* _tmp50_;
 					xmlNode* _tmp51_;
-					gchar* createDate = NULL;
+					gchar* updateDate = NULL;
 					gchar* _tmp52_;
-					xmlNode* _tmp53_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp54_;
-					xmlNode* _tmp55_;
+					gboolean _tmp53_ = FALSE;
+					xmlNode* _tmp54_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp55_;
 					xmlNode* _tmp56_;
-					gchar* updateDate = NULL;
-					gchar* _tmp57_;
-					gboolean _tmp58_ = FALSE;
-					xmlNode* _tmp59_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp60_;
-					xmlNode* _tmp61_;
-					xmlNode* _tmp62_;
-					gchar* _tmp63_;
-					gchar* _tmp64_;
-					gint _tmp65_;
-					gboolean _tmp66_;
+					xmlNode* _tmp57_;
+					gchar* _tmp58_;
+					gchar* _tmp59_;
+					gboolean _tmp60_;
 					gboolean hidden = FALSE;
-					gboolean _tmp67_ = FALSE;
-					xmlNode* _tmp68_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp69_;
-					xmlNode* _tmp70_;
-					xmlNode* _tmp71_;
-					gchar* _tmp72_;
-					gchar* _tmp73_;
-					gint _tmp74_;
-					gboolean _tmp75_;
+					gboolean _tmp61_ = FALSE;
+					xmlNode* _tmp62_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp63_;
+					xmlNode* _tmp64_;
+					xmlNode* _tmp65_;
+					gchar* _tmp66_;
+					gchar* _tmp67_;
+					gboolean _tmp68_;
 					gboolean secure = FALSE;
-					xmlNode* _tmp76_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp77_;
-					xmlNode* _tmp78_;
-					xmlNode* _tmp79_;
+					xmlNode* _tmp69_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp70_;
+					xmlNode* _tmp71_;
+					xmlNode* _tmp72_;
 					gint photoCount = 0;
-					gchar* _tmp80_;
-					gchar* _tmp81_;
-					gint _tmp82_;
-					gint _tmp83_;
-					GeeArrayList* _tmp84_;
+					gchar* _tmp73_;
+					gchar* _tmp74_;
+					gint _tmp75_;
+					GeeArrayList* _tmp76_;
+					gint _tmp77_;
+					const gchar* _tmp78_;
+					const gchar* _tmp79_;
+					const gchar* _tmp80_;
+					const gchar* _tmp81_;
+					const gchar* _tmp82_;
+					gboolean _tmp83_;
+					gboolean _tmp84_;
 					gint _tmp85_;
-					const gchar* _tmp86_;
-					const gchar* _tmp87_;
-					const gchar* _tmp88_;
-					const gchar* _tmp89_;
-					const gchar* _tmp90_;
-					gboolean _tmp91_;
-					gboolean _tmp92_;
-					gint _tmp93_;
-					PublishingRajceAlbum* _tmp94_;
-					PublishingRajceAlbum* _tmp95_;
+					PublishingRajceAlbum* _tmp86_;
+					PublishingRajceAlbum* _tmp87_;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					if (!_tmp24_) {
-#line 2789 "RajcePublishing.c"
-						xmlNode* _tmp25_;
-						xmlNode* _tmp26_;
+					if (!_tmp20_) {
+#line 3038 "RajcePublishing.c"
+						xmlNode* _tmp21_;
+						xmlNode* _tmp22_;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp25_ = album;
+						_tmp21_ = album;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp26_ = _tmp25_->next;
+						_tmp22_ = _tmp21_->next;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						album = _tmp26_;
-#line 2798 "RajcePublishing.c"
+						album = _tmp22_;
+#line 3047 "RajcePublishing.c"
 					}
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp24_ = FALSE;
+					_tmp20_ = FALSE;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp27_ = album;
+					_tmp23_ = album;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					if (!(_tmp27_ != NULL)) {
+					if (!(_tmp23_ != NULL)) {
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						break;
-#line 2808 "RajcePublishing.c"
+#line 3057 "RajcePublishing.c"
 					}
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp28_ = album;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp29_ = (gchar*) xmlGetProp (_tmp28_, (xmlChar*) "id");
+					_tmp24_ = album;
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp30_ = _tmp29_;
+					_tmp25_ = (gchar*) xmlGetProp (_tmp24_, (xmlChar*) "id");
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp31_ = atoi (_tmp30_);
+					_tmp26_ = _tmp25_;
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp32_ = _tmp31_;
+					_tmp27_ = atoi (_tmp26_);
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_g_free0 (_tmp30_);
+					_g_free0 (_tmp26_);
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					id = _tmp32_;
+					id = _tmp27_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp34_ = doc;
+					_tmp29_ = doc;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp35_ = album;
+					_tmp30_ = album;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "albumName", &_inner_error_);
+					_tmp31_ = publishing_rest_support_xml_document_get_named_child (_tmp29_, _tmp30_, "albumName", &_inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp33_ = _tmp36_;
+					_tmp28_ = _tmp31_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2838 "RajcePublishing.c"
+#line 3085 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2848,20 +3095,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 2851 "RajcePublishing.c"
+#line 3098 "RajcePublishing.c"
 					}
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp37_ = (gchar*) xmlNodeGetContent (_tmp33_);
+					_tmp32_ = (gchar*) xmlNodeGetContent (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					albumName = _tmp37_;
+					albumName = _tmp32_;
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp39_ = doc;
+					_tmp34_ = doc;
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp40_ = album;
+					_tmp35_ = album;
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp41_ = publishing_rest_support_xml_document_get_named_child (_tmp39_, _tmp40_, "url", &_inner_error_);
+					_tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "url", &_inner_error_);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp38_ = _tmp41_;
+					_tmp33_ = _tmp36_;
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2870,7 +3117,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2873 "RajcePublishing.c"
+#line 3120 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2885,20 +3132,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 2888 "RajcePublishing.c"
+#line 3135 "RajcePublishing.c"
 					}
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp42_ = (gchar*) xmlNodeGetContent (_tmp38_);
+					_tmp37_ = (gchar*) xmlNodeGetContent (_tmp33_);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					url = _tmp42_;
+					url = _tmp37_;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp44_ = doc;
+					_tmp39_ = doc;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp45_ = album;
+					_tmp40_ = album;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp46_ = publishing_rest_support_xml_document_get_named_child (_tmp44_, _tmp45_, "thumbUrl", &_inner_error_);
+					_tmp41_ = publishing_rest_support_xml_document_get_named_child (_tmp39_, _tmp40_, "thumbUrl", &_inner_error_);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp43_ = _tmp46_;
+					_tmp38_ = _tmp41_;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2909,7 +3156,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2912 "RajcePublishing.c"
+#line 3159 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2926,20 +3173,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 2929 "RajcePublishing.c"
+#line 3176 "RajcePublishing.c"
 					}
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp47_ = (gchar*) xmlNodeGetContent (_tmp43_);
+					_tmp42_ = (gchar*) xmlNodeGetContent (_tmp38_);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					thumbUrl = _tmp47_;
+					thumbUrl = _tmp42_;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp49_ = doc;
+					_tmp44_ = doc;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp50_ = album;
+					_tmp45_ = album;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp51_ = publishing_rest_support_xml_document_get_named_child (_tmp49_, _tmp50_, "createDate", &_inner_error_);
+					_tmp46_ = publishing_rest_support_xml_document_get_named_child (_tmp44_, _tmp45_, "createDate", &_inner_error_);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp48_ = _tmp51_;
+					_tmp43_ = _tmp46_;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2952,7 +3199,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2955 "RajcePublishing.c"
+#line 3202 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2971,20 +3218,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 2974 "RajcePublishing.c"
+#line 3221 "RajcePublishing.c"
 					}
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp52_ = (gchar*) xmlNodeGetContent (_tmp48_);
+					_tmp47_ = (gchar*) xmlNodeGetContent (_tmp43_);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					createDate = _tmp52_;
+					createDate = _tmp47_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp54_ = doc;
+					_tmp49_ = doc;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp55_ = album;
+					_tmp50_ = album;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp56_ = publishing_rest_support_xml_document_get_named_child (_tmp54_, _tmp55_, "updateDate", &_inner_error_);
+					_tmp51_ = publishing_rest_support_xml_document_get_named_child (_tmp49_, _tmp50_, "updateDate", &_inner_error_);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp53_ = _tmp56_;
+					_tmp48_ = _tmp51_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2999,7 +3246,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3002 "RajcePublishing.c"
+#line 3249 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3020,20 +3267,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 3023 "RajcePublishing.c"
+#line 3270 "RajcePublishing.c"
 					}
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp57_ = (gchar*) xmlNodeGetContent (_tmp53_);
+					_tmp52_ = (gchar*) xmlNodeGetContent (_tmp48_);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					updateDate = _tmp57_;
+					updateDate = _tmp52_;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp60_ = doc;
+					_tmp55_ = doc;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp61_ = album;
+					_tmp56_ = album;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp62_ = publishing_rest_support_xml_document_get_named_child (_tmp60_, _tmp61_, "hidden", &_inner_error_);
+					_tmp57_ = publishing_rest_support_xml_document_get_named_child (_tmp55_, _tmp56_, "hidden", &_inner_error_);
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp59_ = _tmp62_;
+					_tmp54_ = _tmp57_;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3050,7 +3297,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3053 "RajcePublishing.c"
+#line 3300 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3073,38 +3320,36 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 3076 "RajcePublishing.c"
+#line 3323 "RajcePublishing.c"
 					}
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp63_ = (gchar*) xmlNodeGetContent (_tmp59_);
+					_tmp58_ = (gchar*) xmlNodeGetContent (_tmp54_);
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp64_ = _tmp63_;
+					_tmp59_ = _tmp58_;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp65_ = atoi (_tmp64_);
+					_tmp60_ = atoi (_tmp59_) > 0;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp66_ = _tmp65_ > 0;
+					_g_free0 (_tmp59_);
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_g_free0 (_tmp64_);
+					if (_tmp60_) {
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					if (_tmp66_) {
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp58_ = TRUE;
-#line 3092 "RajcePublishing.c"
+						_tmp53_ = TRUE;
+#line 3337 "RajcePublishing.c"
 					} else {
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp58_ = FALSE;
-#line 3096 "RajcePublishing.c"
+						_tmp53_ = FALSE;
+#line 3341 "RajcePublishing.c"
 					}
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					hidden = _tmp58_;
+					hidden = _tmp53_;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp69_ = doc;
+					_tmp63_ = doc;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp70_ = album;
+					_tmp64_ = album;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp71_ = publishing_rest_support_xml_document_get_named_child (_tmp69_, _tmp70_, "secure", &_inner_error_);
+					_tmp65_ = publishing_rest_support_xml_document_get_named_child (_tmp63_, _tmp64_, "secure", &_inner_error_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp68_ = _tmp71_;
+					_tmp62_ = _tmp65_;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3121,7 +3366,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3124 "RajcePublishing.c"
+#line 3369 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3144,38 +3389,36 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 3147 "RajcePublishing.c"
+#line 3392 "RajcePublishing.c"
 					}
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp72_ = (gchar*) xmlNodeGetContent (_tmp68_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp73_ = _tmp72_;
+					_tmp66_ = (gchar*) xmlNodeGetContent (_tmp62_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp74_ = atoi (_tmp73_);
+					_tmp67_ = _tmp66_;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp75_ = _tmp74_ > 0;
+					_tmp68_ = atoi (_tmp67_) > 0;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_g_free0 (_tmp73_);
+					_g_free0 (_tmp67_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					if (_tmp75_) {
+					if (_tmp68_) {
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp67_ = TRUE;
-#line 3163 "RajcePublishing.c"
+						_tmp61_ = TRUE;
+#line 3406 "RajcePublishing.c"
 					} else {
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp67_ = FALSE;
-#line 3167 "RajcePublishing.c"
+						_tmp61_ = FALSE;
+#line 3410 "RajcePublishing.c"
 					}
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					secure = _tmp67_;
+					secure = _tmp61_;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp77_ = doc;
+					_tmp70_ = doc;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp78_ = album;
+					_tmp71_ = album;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp79_ = publishing_rest_support_xml_document_get_named_child (_tmp77_, _tmp78_, "photoCount", &_inner_error_);
+					_tmp72_ = publishing_rest_support_xml_document_get_named_child (_tmp70_, _tmp71_, "photoCount", &_inner_error_);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp76_ = _tmp79_;
+					_tmp69_ = _tmp72_;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3192,7 +3435,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3195 "RajcePublishing.c"
+#line 3438 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3215,48 +3458,46 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						g_clear_error (&_inner_error_);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						return;
-#line 3218 "RajcePublishing.c"
+#line 3461 "RajcePublishing.c"
 					}
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp80_ = (gchar*) xmlNodeGetContent (_tmp76_);
+					_tmp73_ = (gchar*) xmlNodeGetContent (_tmp69_);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp81_ = _tmp80_;
+					_tmp74_ = _tmp73_;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp82_ = atoi (_tmp81_);
+					_tmp75_ = atoi (_tmp74_);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp83_ = _tmp82_;
+					_g_free0 (_tmp74_);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_g_free0 (_tmp81_);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					photoCount = _tmp83_;
+					photoCount = _tmp75_;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp84_ = list;
+					_tmp76_ = list;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp85_ = id;
+					_tmp77_ = id;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp86_ = albumName;
+					_tmp78_ = albumName;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp87_ = url;
+					_tmp79_ = url;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp88_ = thumbUrl;
+					_tmp80_ = thumbUrl;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp89_ = createDate;
+					_tmp81_ = createDate;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp90_ = updateDate;
+					_tmp82_ = updateDate;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp91_ = hidden;
+					_tmp83_ = hidden;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp92_ = secure;
+					_tmp84_ = secure;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp93_ = photoCount;
+					_tmp85_ = photoCount;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp94_ = publishing_rajce_album_new (_tmp85_, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp93_);
+					_tmp86_ = publishing_rajce_album_new (_tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp85_);
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp95_ = _tmp94_;
+					_tmp87_ = _tmp86_;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp95_);
+					gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp87_);
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_publishing_rajce_album_unref0 (_tmp95_);
+					_publishing_rajce_album_unref0 (_tmp87_);
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_g_free0 (updateDate);
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3267,47 +3508,47 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 					_g_free0 (url);
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_g_free0 (albumName);
-#line 3270 "RajcePublishing.c"
+#line 3511 "RajcePublishing.c"
 				}
 			}
 		}
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp96_ = list;
+		_tmp88_ = list;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_LIST, GeeList), _publishing_rajce_album_compare_albums_gcompare_data_func, NULL, NULL);
+		gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_LIST, GeeList), _publishing_rajce_album_compare_albums_gcompare_data_func, NULL, NULL);
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp97_ = list;
+		_tmp89_ = list;
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp99_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp98_);
+		_tmp91_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp90_);
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->albums = _tmp99_;
+		self->priv->albums = _tmp91_;
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->albums_length1 = _tmp98_;
+		self->priv->albums_length1 = _tmp90_;
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		self->priv->_albums_size_ = self->priv->albums_length1;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp100_ = self->priv->session;
+		_tmp92_ = self->priv->session;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp101_ = sessionToken;
+		_tmp93_ = sessionToken;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp102_ = (gchar*) xmlNodeGetContent (_tmp101_);
+		_tmp94_ = (gchar*) xmlNodeGetContent (_tmp93_);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp103_ = _tmp102_;
+		_tmp95_ = _tmp94_;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_usertoken (_tmp100_, _tmp103_);
+		publishing_rajce_session_set_usertoken (_tmp92_, _tmp95_);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp103_);
+		_g_free0 (_tmp95_);
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 3304 "RajcePublishing.c"
+#line 3545 "RajcePublishing.c"
 	}
 	goto __finally19;
 	__catch19_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp104_;
+		GError* _tmp96_;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3315,16 +3556,16 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:326: ERROR: on_albums_fetch_complete");
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp104_ = err;
+		_tmp96_ = err;
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_rajce_publisher_do_show_error (self, _tmp104_);
+		publishing_rajce_rajce_publisher_do_show_error (self, _tmp96_);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (list);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 3327 "RajcePublishing.c"
+#line 3568 "RajcePublishing.c"
 	}
 	__finally19:
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3337,26 +3578,26 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 		g_clear_error (&_inner_error_);
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 3340 "RajcePublishing.c"
+#line 3581 "RajcePublishing.c"
 	}
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_publishing_options_pane (self);
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (list);
-#line 3346 "RajcePublishing.c"
+#line 3587 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the fetch albums transaction fails due to a network error.
      */
-static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self,
+                                                        PublishingRESTSupportTransaction* bad_txn,
+                                                        GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	GError* _tmp5_;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3364,45 +3605,46 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRa
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:338: EVENT: on_albums_fetch_error");
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = bad_txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_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_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = bad_txn;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = err;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 3384 "RajcePublishing.c"
+	publishing_rajce_rajce_publisher_on_network_error (self, bad_txn, err);
+#line 3617 "RajcePublishing.c"
 }
 
 
 /**
      * Action that shows the publishing options pane.
      */
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                                             gpointer self)
+{
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked ((PublishingRajceRajcePublisher*) self);
-#line 3394 "RajcePublishing.c"
+#line 3630 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                                               PublishingRajcePublishingParameters* parameters,
+                                                                                                                               gpointer self)
+{
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked ((PublishingRajceRajcePublisher*) self, parameters);
-#line 3401 "RajcePublishing.c"
+#line 3641 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajcePublishingOptionsPane* opts_pane = NULL;
 	PublishingRajceSession* _tmp1_;
@@ -3462,14 +3704,16 @@ static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (Pu
 	_g_object_unref0 (_tmp10_);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 3465 "RajcePublishing.c"
+#line 3707 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the user clicks logout in the publishing options pane.
      */
-static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked (PublishingRajceRajcePublisher* self)
+{
 	PublishingRajceSession* _tmp0_;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -3482,7 +3726,7 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_c
 	publishing_rajce_session_deauthenticate (_tmp0_);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3484 "RajcePublishing.c"
+#line 3728 "RajcePublishing.c"
 }
 
 
@@ -3491,16 +3735,20 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_c
      *
      * @param parameters the publishing parameters
      */
-static gpointer _publishing_rajce_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_rajce_publishing_parameters_ref0 (gpointer self)
+{
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? publishing_rajce_publishing_parameters_ref (self) : NULL;
-#line 3496 "RajcePublishing.c"
+#line 3742 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self, PublishingRajcePublishingParameters* parameters) {
+static void
+publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self,
+                                                                             PublishingRajcePublishingParameters* parameters)
+{
 	PublishingRajcePublishingParameters* _tmp0_;
-	PublishingRajcePublishingParameters* _tmp1_;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3509,76 +3757,93 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_
 	g_debug ("RajcePublishing.vala:375: EVENT: on_publishing_options_pane_publish_cl" \
 "icked");
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = parameters;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = _publishing_rajce_publishing_parameters_ref0 (_tmp0_);
+	_tmp0_ = _publishing_rajce_publishing_parameters_ref0 (parameters);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->parameters = _tmp1_;
+	self->priv->parameters = _tmp0_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_begin_upload (self);
-#line 3519 "RajcePublishing.c"
+#line 3765 "RajcePublishing.c"
 }
 
 
 /**
      * Begin upload action: open existing album or create a new one
      */
-static gboolean _int_equal (const gint * s1, const gint * s2) {
+static gboolean
+_int_equal (const gint * s1,
+            const gint * s2)
+{
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (s1 == s2) {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return TRUE;
-#line 3531 "RajcePublishing.c"
+#line 3780 "RajcePublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (s1 == NULL) {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return FALSE;
-#line 3537 "RajcePublishing.c"
+#line 3786 "RajcePublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (s2 == NULL) {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return FALSE;
-#line 3543 "RajcePublishing.c"
+#line 3792 "RajcePublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return (*s1) == (*s2);
-#line 3547 "RajcePublishing.c"
+#line 3796 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                           GError* err,
+                                                                                                           gpointer self)
+{
 #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_create_album_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 3554 "RajcePublishing.c"
+#line 3807 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                          gpointer self)
+{
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_create_album_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 3561 "RajcePublishing.c"
+#line 3817 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                         GError* err,
+                                                                                                         gpointer self)
+{
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_open_album_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 3568 "RajcePublishing.c"
+#line 3828 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                        gpointer self)
+{
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_open_album_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 3575 "RajcePublishing.c"
+#line 3838 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajcePublishingParameters* _tmp1_;
 	gint* _tmp2_;
@@ -3598,7 +3863,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 	_tmp3_ = 0;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_int_equal (_tmp2_, &_tmp3_) == TRUE) {
-#line 3599 "RajcePublishing.c"
+#line 3864 "RajcePublishing.c"
 		PublishingRajceCreateAlbumTransaction* create_album_trans = NULL;
 		PublishingRajceSession* _tmp4_;
 		gchar* _tmp5_;
@@ -3643,7 +3908,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 		_tmp14_ = create_album_trans;
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3644 "RajcePublishing.c"
+#line 3909 "RajcePublishing.c"
 		{
 			PublishingRajceCreateAlbumTransaction* _tmp15_;
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3654,7 +3919,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3655 "RajcePublishing.c"
+#line 3920 "RajcePublishing.c"
 					goto __catch20_spit_publishing_publishing_error;
 				}
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3665,7 +3930,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 				g_clear_error (&_inner_error_);
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				return;
-#line 3666 "RajcePublishing.c"
+#line 3931 "RajcePublishing.c"
 			}
 		}
 		goto __finally20;
@@ -3685,7 +3950,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 			publishing_rajce_rajce_publisher_do_show_error (self, _tmp16_);
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_g_error_free0 (err);
-#line 3686 "RajcePublishing.c"
+#line 3951 "RajcePublishing.c"
 		}
 		__finally20:
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3698,11 +3963,11 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 			g_clear_error (&_inner_error_);
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 3699 "RajcePublishing.c"
+#line 3964 "RajcePublishing.c"
 		}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_transaction_unref0 (create_album_trans);
-#line 3703 "RajcePublishing.c"
+#line 3968 "RajcePublishing.c"
 	} else {
 		PublishingRajceOpenAlbumTransaction* open_album_trans = NULL;
 		PublishingRajceSession* _tmp17_;
@@ -3742,7 +4007,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 		_tmp25_ = open_album_trans;
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3743 "RajcePublishing.c"
+#line 4008 "RajcePublishing.c"
 		{
 			PublishingRajceOpenAlbumTransaction* _tmp26_;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3753,7 +4018,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3754 "RajcePublishing.c"
+#line 4019 "RajcePublishing.c"
 					goto __catch21_spit_publishing_publishing_error;
 				}
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3764,7 +4029,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 				g_clear_error (&_inner_error_);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				return;
-#line 3765 "RajcePublishing.c"
+#line 4030 "RajcePublishing.c"
 			}
 		}
 		goto __finally21;
@@ -3784,7 +4049,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 			publishing_rajce_rajce_publisher_do_show_error (self, _tmp27_);
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_g_error_free0 (err);
-#line 3785 "RajcePublishing.c"
+#line 4050 "RajcePublishing.c"
 		}
 		__finally21:
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3797,11 +4062,11 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 			g_clear_error (&_inner_error_);
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 3798 "RajcePublishing.c"
+#line 4063 "RajcePublishing.c"
 		}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_transaction_unref0 (open_album_trans);
-#line 3802 "RajcePublishing.c"
+#line 4067 "RajcePublishing.c"
 	}
 }
 
@@ -3809,7 +4074,9 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
 /**
      * Event triggered when the create album completes successfully.
      */
-static gint* _int_dup (gint* self) {
+static gint*
+_int_dup (gint* self)
+{
 	gint* dup;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	dup = g_new0 (gint, 1);
@@ -3817,25 +4084,27 @@ static gint* _int_dup (gint* self) {
 	memcpy (dup, self, sizeof (gint));
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return dup;
-#line 3818 "RajcePublishing.c"
+#line 4085 "RajcePublishing.c"
 }
 
 
-static gpointer __int_dup0 (gpointer self) {
+static gpointer
+__int_dup0 (gpointer self)
+{
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? _int_dup (self) : NULL;
-#line 3825 "RajcePublishing.c"
+#line 4094 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self,
+                                                           PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -3844,82 +4113,73 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 #line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:427: EVENT: on_create_album_complete");
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_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_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error, self);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = txn;
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:430: RajcePlugin: create album: %s", _tmp6_);
+	g_debug ("RajcePublishing.vala:430: RajcePlugin: create album: %s", _tmp3_);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp6_);
-#line 3866 "RajcePublishing.c"
+	_g_free0 (_tmp3_);
+#line 4129 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		PublishingRESTSupportXmlDocument* _tmp10_;
-		PublishingRESTSupportXmlDocument* _tmp11_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		PublishingRESTSupportXmlDocument* _tmp7_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp11_;
+		xmlNode* _tmp12_;
 		xmlNode* _tmp13_;
-		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_;
-		xmlNode* _tmp16_;
-		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_;
-		xmlNode* _tmp19_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp20_;
-		xmlNode* _tmp21_;
-		xmlNode* _tmp22_;
+		gchar* _tmp14_;
+		xmlNode* _tmp15_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp16_;
+		xmlNode* _tmp17_;
+		xmlNode* _tmp18_;
 		gchar* albumToken = NULL;
-		gchar* _tmp23_;
-		xmlNode* _tmp24_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp25_;
-		xmlNode* _tmp26_;
-		xmlNode* _tmp27_;
-		PublishingRajcePublishingParameters* _tmp28_;
-		gchar* _tmp29_;
-		gchar* _tmp30_;
-		gint _tmp31_;
-		gint* _tmp32_;
-		PublishingRajceSession* _tmp33_;
-		const gchar* _tmp34_;
-		PublishingRajceSession* _tmp35_;
-		const gchar* _tmp36_;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = txn;
+		gchar* _tmp19_;
+		xmlNode* _tmp20_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp21_;
+		xmlNode* _tmp22_;
+		xmlNode* _tmp23_;
+		PublishingRajcePublishingParameters* _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
+		gint _tmp27_;
+		gint* _tmp28_;
+		PublishingRajceSession* _tmp29_;
+		const gchar* _tmp30_;
+		PublishingRajceSession* _tmp31_;
+		const gchar* _tmp32_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+		_tmp4_ = publishing_rest_support_transaction_get_response (txn);
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp5_ = _tmp4_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = _tmp10_;
+		_tmp7_ = _tmp6_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp5_);
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		doc = _tmp11_;
+		doc = _tmp7_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3920 "RajcePublishing.c"
+#line 4180 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3928,29 +4188,29 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 			g_clear_error (&_inner_error_);
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 3929 "RajcePublishing.c"
+#line 4189 "RajcePublishing.c"
 		}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = doc;
+		_tmp8_ = doc;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+		_tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		response = _tmp13_;
+		response = _tmp9_;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = doc;
+		_tmp11_ = doc;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = response;
+		_tmp12_ = response;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = _tmp17_;
+		_tmp10_ = _tmp13_;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3951 "RajcePublishing.c"
+#line 4211 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3961,20 +4221,20 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 			g_clear_error (&_inner_error_);
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 3962 "RajcePublishing.c"
+#line 4222 "RajcePublishing.c"
 		}
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+		_tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		sessionToken = _tmp18_;
+		sessionToken = _tmp14_;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = doc;
+		_tmp16_ = doc;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = response;
+		_tmp17_ = response;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "albumToken", &_inner_error_);
+		_tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "albumToken", &_inner_error_);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = _tmp22_;
+		_tmp15_ = _tmp18_;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3983,7 +4243,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3984 "RajcePublishing.c"
+#line 4244 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3996,20 +4256,20 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 			g_clear_error (&_inner_error_);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 3997 "RajcePublishing.c"
+#line 4257 "RajcePublishing.c"
 		}
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
+		_tmp19_ = (gchar*) xmlNodeGetContent (_tmp15_);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		albumToken = _tmp23_;
+		albumToken = _tmp19_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp25_ = doc;
+		_tmp21_ = doc;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = response;
+		_tmp22_ = response;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = publishing_rest_support_xml_document_get_named_child (_tmp25_, _tmp26_, "albumID", &_inner_error_);
+		_tmp23_ = publishing_rest_support_xml_document_get_named_child (_tmp21_, _tmp22_, "albumID", &_inner_error_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp24_ = _tmp27_;
+		_tmp20_ = _tmp23_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4020,7 +4280,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4021 "RajcePublishing.c"
+#line 4281 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4035,49 +4295,49 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 			g_clear_error (&_inner_error_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4036 "RajcePublishing.c"
+#line 4296 "RajcePublishing.c"
 		}
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_ = self->priv->parameters;
+		_tmp24_ = self->priv->parameters;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp29_ = (gchar*) xmlNodeGetContent (_tmp24_);
+		_tmp25_ = (gchar*) xmlNodeGetContent (_tmp20_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp30_ = _tmp29_;
+		_tmp26_ = _tmp25_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp31_ = atoi (_tmp30_);
+		_tmp27_ = atoi (_tmp26_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp32_ = __int_dup0 (&_tmp31_);
+		_tmp28_ = __int_dup0 (&_tmp27_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp28_->album_id);
+		_g_free0 (_tmp24_->album_id);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_->album_id = _tmp32_;
+		_tmp24_->album_id = _tmp28_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp30_);
+		_g_free0 (_tmp26_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp33_ = self->priv->session;
+		_tmp29_ = self->priv->session;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp34_ = sessionToken;
+		_tmp30_ = sessionToken;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_usertoken (_tmp33_, _tmp34_);
+		publishing_rajce_session_set_usertoken (_tmp29_, _tmp30_);
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp35_ = self->priv->session;
+		_tmp31_ = self->priv->session;
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp36_ = albumToken;
+		_tmp32_ = albumToken;
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_albumtoken (_tmp35_, _tmp36_);
+		publishing_rajce_session_set_albumtoken (_tmp31_, _tmp32_);
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (albumToken);
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (sessionToken);
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4072 "RajcePublishing.c"
+#line 4332 "RajcePublishing.c"
 	}
 	goto __finally22;
 	__catch22_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp37_;
+		GError* _tmp33_;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4085,14 +4345,14 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:443: ERROR: on_create_album_complete");
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp37_ = err;
+		_tmp33_ = err;
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_rajce_publisher_do_show_error (self, _tmp37_);
+		publishing_rajce_rajce_publisher_do_show_error (self, _tmp33_);
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4093 "RajcePublishing.c"
+#line 4353 "RajcePublishing.c"
 	}
 	__finally22:
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4103,24 +4363,24 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 		g_clear_error (&_inner_error_);
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4104 "RajcePublishing.c"
+#line 4364 "RajcePublishing.c"
 	}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_upload_photos (self);
-#line 4108 "RajcePublishing.c"
+#line 4368 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the create album transaction fails due to a network error.
      */
-static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self,
+                                                        PublishingRESTSupportTransaction* bad_txn,
+                                                        GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	GError* _tmp5_;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4128,38 +4388,30 @@ static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRa
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:455: EVENT: on_create_album_error");
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = bad_txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error, self);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = bad_txn;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error, self);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4146 "RajcePublishing.c"
+	publishing_rajce_rajce_publisher_on_network_error (self, bad_txn, err);
+#line 4398 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the open album completes successfully.
      */
-static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self,
+                                                         PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -4168,73 +4420,64 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:466: EVENT: on_open_album_complete");
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_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_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error, self);
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = txn;
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:469: RajcePlugin: open album: %s", _tmp6_);
+	g_debug ("RajcePublishing.vala:469: RajcePlugin: open album: %s", _tmp3_);
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp6_);
-#line 4190 "RajcePublishing.c"
+	_g_free0 (_tmp3_);
+#line 4436 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		PublishingRESTSupportXmlDocument* _tmp10_;
-		PublishingRESTSupportXmlDocument* _tmp11_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		PublishingRESTSupportXmlDocument* _tmp7_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp11_;
+		xmlNode* _tmp12_;
 		xmlNode* _tmp13_;
-		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_;
-		xmlNode* _tmp16_;
-		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_;
-		xmlNode* _tmp19_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp20_;
-		xmlNode* _tmp21_;
-		xmlNode* _tmp22_;
+		gchar* _tmp14_;
+		xmlNode* _tmp15_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp16_;
+		xmlNode* _tmp17_;
+		xmlNode* _tmp18_;
 		gchar* albumToken = NULL;
-		gchar* _tmp23_;
-		PublishingRajceSession* _tmp24_;
-		const gchar* _tmp25_;
-		PublishingRajceSession* _tmp26_;
-		const gchar* _tmp27_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = txn;
+		gchar* _tmp19_;
+		PublishingRajceSession* _tmp20_;
+		const gchar* _tmp21_;
+		PublishingRajceSession* _tmp22_;
+		const gchar* _tmp23_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+		_tmp4_ = publishing_rest_support_transaction_get_response (txn);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp5_ = _tmp4_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = _tmp10_;
+		_tmp7_ = _tmp6_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp5_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		doc = _tmp11_;
+		doc = _tmp7_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4235 "RajcePublishing.c"
+#line 4478 "RajcePublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4243,29 +4486,29 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 			g_clear_error (&_inner_error_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4244 "RajcePublishing.c"
+#line 4487 "RajcePublishing.c"
 		}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = doc;
+		_tmp8_ = doc;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+		_tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		response = _tmp13_;
+		response = _tmp9_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = doc;
+		_tmp11_ = doc;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = response;
+		_tmp12_ = response;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = _tmp17_;
+		_tmp10_ = _tmp13_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4266 "RajcePublishing.c"
+#line 4509 "RajcePublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4276,20 +4519,20 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 			g_clear_error (&_inner_error_);
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4277 "RajcePublishing.c"
+#line 4520 "RajcePublishing.c"
 		}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+		_tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		sessionToken = _tmp18_;
+		sessionToken = _tmp14_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = doc;
+		_tmp16_ = doc;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = response;
+		_tmp17_ = response;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "albumToken", &_inner_error_);
+		_tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "albumToken", &_inner_error_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = _tmp22_;
+		_tmp15_ = _tmp18_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4298,7 +4541,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4299 "RajcePublishing.c"
+#line 4542 "RajcePublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4311,37 +4554,37 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 			g_clear_error (&_inner_error_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4312 "RajcePublishing.c"
+#line 4555 "RajcePublishing.c"
 		}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
+		_tmp19_ = (gchar*) xmlNodeGetContent (_tmp15_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		albumToken = _tmp23_;
+		albumToken = _tmp19_;
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp24_ = self->priv->session;
+		_tmp20_ = self->priv->session;
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp25_ = sessionToken;
+		_tmp21_ = sessionToken;
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_usertoken (_tmp24_, _tmp25_);
+		publishing_rajce_session_set_usertoken (_tmp20_, _tmp21_);
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = self->priv->session;
+		_tmp22_ = self->priv->session;
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = albumToken;
+		_tmp23_ = albumToken;
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_albumtoken (_tmp26_, _tmp27_);
+		publishing_rajce_session_set_albumtoken (_tmp22_, _tmp23_);
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (albumToken);
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (sessionToken);
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4336 "RajcePublishing.c"
+#line 4579 "RajcePublishing.c"
 	}
 	goto __finally23;
 	__catch23_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp28_;
+		GError* _tmp24_;
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4349,14 +4592,14 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:481: ERROR: on_open_album_complete");
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_ = err;
+		_tmp24_ = err;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_rajce_publisher_do_show_error (self, _tmp28_);
+		publishing_rajce_rajce_publisher_do_show_error (self, _tmp24_);
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4357 "RajcePublishing.c"
+#line 4600 "RajcePublishing.c"
 	}
 	__finally23:
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4367,24 +4610,24 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 		g_clear_error (&_inner_error_);
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4368 "RajcePublishing.c"
+#line 4611 "RajcePublishing.c"
 	}
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_upload_photos (self);
-#line 4372 "RajcePublishing.c"
+#line 4615 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the open album transaction fails due to a network error.
      */
-static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self,
+                                                      PublishingRESTSupportTransaction* bad_txn,
+                                                      GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	GError* _tmp5_;
 #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4392,71 +4635,76 @@ static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajc
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:493: EVENT: on_open_album_error");
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = bad_txn;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_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_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error, self);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error, self);
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = err;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4410 "RajcePublishing.c"
+	publishing_rajce_rajce_publisher_on_network_error (self, bad_txn, err);
+#line 4645 "RajcePublishing.c"
 }
 
 
 /**
      * Upload photos: the key part of the plugin
      */
-static void _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                    gint num_photos_published,
+                                                                                                                    gpointer self)
+{
 #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_upload_photos_complete ((PublishingRajceRajcePublisher*) self, _sender, num_photos_published);
-#line 4420 "RajcePublishing.c"
+#line 4659 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                              GError* err,
+                                                                                                              gpointer self)
+{
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_upload_photos_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 4427 "RajcePublishing.c"
+#line 4670 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                     gdouble fraction_complete,
+                                                                                                     gpointer self)
+{
 #line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_upload_photos_status_updated ((PublishingRajceRajcePublisher*) self, file_number, fraction_complete);
-#line 4434 "RajcePublishing.c"
+#line 4681 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajceSession* _tmp1_;
-	gint _tmp2_;
-	void* _tmp3_;
-	GDestroyNotify _tmp4_;
-	SpitPublishingProgressCallback _tmp5_;
+	void* _tmp2_;
+	GDestroyNotify _tmp3_;
+	SpitPublishingProgressCallback _tmp4_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp6_;
-	gint _tmp7_;
-	SpitPublishingPublishable** _tmp8_;
+	SpitPublishingPluginHost* _tmp5_;
+	gint _tmp6_;
+	SpitPublishingPublishable** _tmp7_;
 	gint publishables_length1;
 	gint _publishables_size_;
 	PublishingRajceUploader* uploader = NULL;
-	PublishingRajceSession* _tmp9_;
+	PublishingRajceSession* _tmp8_;
+	gchar* _tmp9_;
 	gchar* _tmp10_;
-	gchar* _tmp11_;
-	PublishingRajcePublishingParameters* _tmp12_;
+	PublishingRajcePublishingParameters* _tmp11_;
+	PublishingRajceUploader* _tmp12_;
 	PublishingRajceUploader* _tmp13_;
-	PublishingRajceUploader* _tmp14_;
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4466,9 +4714,7 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = self->priv->session;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_session_get_maxsize (_tmp1_);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = spit_publishing_plugin_host_serialize_publishables (_tmp0_, _tmp2_, FALSE, &_tmp3_, &_tmp4_);
+	_tmp4_ = spit_publishing_plugin_host_serialize_publishables (_tmp0_, publishing_rajce_session_get_maxsize (_tmp1_), FALSE, &_tmp2_, &_tmp3_);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4478,37 +4724,37 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->progress_reporter = _tmp5_;
+	self->priv->progress_reporter = _tmp4_;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->progress_reporter_target = _tmp3_;
+	self->priv->progress_reporter_target = _tmp2_;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp4_;
+	self->priv->progress_reporter_target_destroy_notify = _tmp3_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = self->priv->host;
+	_tmp5_ = self->priv->host;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = spit_publishing_plugin_host_get_publishables (_tmp6_, &_tmp7_);
+	_tmp7_ = spit_publishing_plugin_host_get_publishables (_tmp5_, &_tmp6_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishables = _tmp8_;
+	publishables = _tmp7_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishables_length1 = _tmp7_;
+	publishables_length1 = _tmp6_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishables_size_ = publishables_length1;
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = self->priv->session;
+	_tmp8_ = self->priv->session;
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = publishing_rajce_rajce_publisher_get_url (self);
+	_tmp9_ = publishing_rajce_rajce_publisher_get_url (self);
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp12_ = self->priv->parameters;
+	_tmp11_ = self->priv->parameters;
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp13_ = publishing_rajce_uploader_new (_tmp9_, _tmp11_, publishables, publishables_length1, _tmp12_);
+	_tmp12_ = publishing_rajce_uploader_new (_tmp8_, _tmp10_, publishables, publishables_length1, _tmp11_);
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp11_);
+	_g_free0 (_tmp10_);
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	uploader = _tmp14_;
+	uploader = _tmp13_;
 #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4519,7 +4765,7 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 4520 "RajcePublishing.c"
+#line 4766 "RajcePublishing.c"
 }
 
 
@@ -4527,11 +4773,13 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
      * Event triggered when the batch uploader reports that at least one of the
      * network transactions encapsulating uploads has completed successfully
      */
-static void publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self,
+                                                            PublishingRESTSupportBatchUploader* uploader,
+                                                            gint num_published)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4539,20 +4787,16 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:520: EVENT: on_upload_photos_complete");
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = uploader;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_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_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_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_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_end_upload (self);
-#line 4553 "RajcePublishing.c"
+#line 4797 "RajcePublishing.c"
 }
 
 
@@ -4560,12 +4804,13 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi
      * 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_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self,
+                                                         PublishingRESTSupportBatchUploader* uploader,
+                                                         GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	GError* _tmp4_;
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4573,85 +4818,70 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingR
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:534: EVENT: on_upload_photos_error");
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = uploader;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_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_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_do_show_error (self, _tmp4_);
-#line 4589 "RajcePublishing.c"
+	publishing_rajce_rajce_publisher_do_show_error (self, err);
+#line 4828 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when upload progresses and the status needs to be updated.
      */
-static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self,
+                                                                  gint file_number,
+                                                                  gdouble completed_fraction)
+{
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp0_) {
-#line 4604 "RajcePublishing.c"
-		gdouble _tmp1_;
-		SpitPublishingProgressCallback _tmp2_;
-		void* _tmp2__target;
-		SpitPublishingProgressCallback _tmp3_;
-		void* _tmp3__target;
-		gint _tmp4_;
-		gdouble _tmp5_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp1_ = completed_fraction;
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 4844 "RajcePublishing.c"
+		SpitPublishingProgressCallback _tmp0_;
+		void* _tmp0__target;
+		SpitPublishingProgressCallback _tmp1_;
+		void* _tmp1__target;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:547: EVENT: uploader reports upload %.2f percent " \
-"complete.", 100.0 * _tmp1_);
+"complete.", 100.0 * completed_fraction);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp2_ = self->priv->progress_reporter;
+		_tmp0_ = self->priv->progress_reporter;
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp2__target = self->priv->progress_reporter_target;
+		_tmp0__target = self->priv->progress_reporter_target;
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3_ = self->priv->progress_reporter;
+		_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3__target = self->priv->progress_reporter_target;
+		_tmp1_ = self->priv->progress_reporter;
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = file_number;
+		_tmp1__target = self->priv->progress_reporter_target;
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp5_ = completed_fraction;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4632 "RajcePublishing.c"
+		_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 4863 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self)
+{
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = publishing_rajce_rajce_publisher_get_show_album (self);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp0_) {
+	if (publishing_rajce_rajce_publisher_get_show_album (self)) {
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_rajce_publisher_do_get_album_url (self);
-#line 4647 "RajcePublishing.c"
+#line 4877 "RajcePublishing.c"
 	} else {
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_rajce_publisher_do_close_album (self);
-#line 4651 "RajcePublishing.c"
+#line 4881 "RajcePublishing.c"
 	}
 }
 
@@ -4659,21 +4889,30 @@ static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajce
 /**
      * End upload action: get album url
      */
-static void _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                            GError* err,
+                                                                                                            gpointer self)
+{
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_get_album_url_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 4662 "RajcePublishing.c"
+#line 4896 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                           gpointer self)
+{
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_get_album_url_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 4669 "RajcePublishing.c"
+#line 4906 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajceGetAlbumUrlTransaction* get_album_url_trans = NULL;
 	PublishingRajceSession* _tmp1_;
@@ -4708,7 +4947,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4708 "RajcePublishing.c"
+#line 4947 "RajcePublishing.c"
 	{
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4716,7 +4955,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4716 "RajcePublishing.c"
+#line 4955 "RajcePublishing.c"
 				goto __catch24_spit_publishing_publishing_error;
 			}
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4727,7 +4966,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
 			g_clear_error (&_inner_error_);
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4727 "RajcePublishing.c"
+#line 4966 "RajcePublishing.c"
 		}
 	}
 	goto __finally24;
@@ -4747,7 +4986,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
 		publishing_rajce_rajce_publisher_do_show_error (self, _tmp6_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
-#line 4747 "RajcePublishing.c"
+#line 4986 "RajcePublishing.c"
 	}
 	__finally24:
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4760,25 +4999,25 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
 		g_clear_error (&_inner_error_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4760 "RajcePublishing.c"
+#line 4999 "RajcePublishing.c"
 	}
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (get_album_url_trans);
-#line 4764 "RajcePublishing.c"
+#line 5003 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the get album url completes successfully.
      */
-static void publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self,
+                                                            PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -4787,73 +5026,64 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:591: EVENT: on_get_album_url_complete");
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self);
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self);
 #line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self);
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:594: RajcePlugin: get album url: %s", _tmp6_);
+	g_debug ("RajcePublishing.vala:594: RajcePlugin: get album url: %s", _tmp3_);
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp6_);
-#line 4808 "RajcePublishing.c"
+	_g_free0 (_tmp3_);
+#line 5041 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		PublishingRESTSupportXmlDocument* _tmp10_;
-		PublishingRESTSupportXmlDocument* _tmp11_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		PublishingRESTSupportXmlDocument* _tmp7_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp11_;
+		xmlNode* _tmp12_;
 		xmlNode* _tmp13_;
-		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_;
-		xmlNode* _tmp16_;
-		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_;
-		xmlNode* _tmp19_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp20_;
-		xmlNode* _tmp21_;
-		xmlNode* _tmp22_;
+		gchar* _tmp14_;
+		xmlNode* _tmp15_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp16_;
+		xmlNode* _tmp17_;
+		xmlNode* _tmp18_;
 		gchar* url = NULL;
-		gchar* _tmp23_;
-		PublishingRajceSession* _tmp24_;
-		const gchar* _tmp25_;
-		PublishingRajceSession* _tmp26_;
-		const gchar* _tmp27_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = txn;
+		gchar* _tmp19_;
+		PublishingRajceSession* _tmp20_;
+		const gchar* _tmp21_;
+		PublishingRajceSession* _tmp22_;
+		const gchar* _tmp23_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+		_tmp4_ = publishing_rest_support_transaction_get_response (txn);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp5_ = _tmp4_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = _tmp10_;
+		_tmp7_ = _tmp6_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp5_);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		doc = _tmp11_;
+		doc = _tmp7_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4853 "RajcePublishing.c"
+#line 5083 "RajcePublishing.c"
 				goto __catch25_spit_publishing_publishing_error;
 			}
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4862,29 +5092,29 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4862 "RajcePublishing.c"
+#line 5092 "RajcePublishing.c"
 		}
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = doc;
+		_tmp8_ = doc;
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+		_tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		response = _tmp13_;
+		response = _tmp9_;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = doc;
+		_tmp11_ = doc;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = response;
+		_tmp12_ = response;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = _tmp17_;
+		_tmp10_ = _tmp13_;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4884 "RajcePublishing.c"
+#line 5114 "RajcePublishing.c"
 				goto __catch25_spit_publishing_publishing_error;
 			}
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4895,20 +5125,20 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4895 "RajcePublishing.c"
+#line 5125 "RajcePublishing.c"
 		}
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+		_tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		sessionToken = _tmp18_;
+		sessionToken = _tmp14_;
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = doc;
+		_tmp16_ = doc;
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = response;
+		_tmp17_ = response;
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "url", &_inner_error_);
+		_tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "url", &_inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = _tmp22_;
+		_tmp15_ = _tmp18_;
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4917,7 +5147,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4917 "RajcePublishing.c"
+#line 5147 "RajcePublishing.c"
 				goto __catch25_spit_publishing_publishing_error;
 			}
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4930,31 +5160,31 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 4930 "RajcePublishing.c"
+#line 5160 "RajcePublishing.c"
 		}
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
+		_tmp19_ = (gchar*) xmlNodeGetContent (_tmp15_);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		url = _tmp23_;
+		url = _tmp19_;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp24_ = self->priv->session;
+		_tmp20_ = self->priv->session;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp25_ = sessionToken;
+		_tmp21_ = sessionToken;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_usertoken (_tmp24_, _tmp25_);
+		publishing_rajce_session_set_usertoken (_tmp20_, _tmp21_);
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = self->priv->session;
+		_tmp22_ = self->priv->session;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = url;
+		_tmp23_ = url;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_albumticket (_tmp26_, _tmp27_);
+		publishing_rajce_session_set_albumticket (_tmp22_, _tmp23_);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (url);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (sessionToken);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4954 "RajcePublishing.c"
+#line 5184 "RajcePublishing.c"
 	}
 	goto __finally25;
 	__catch25_spit_publishing_publishing_error:
@@ -4968,7 +5198,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 		g_debug ("RajcePublishing.vala:606: ERROR: on_get_album_url_complete");
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
-#line 4968 "RajcePublishing.c"
+#line 5198 "RajcePublishing.c"
 	}
 	__finally25:
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4979,22 +5209,24 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 		g_clear_error (&_inner_error_);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4979 "RajcePublishing.c"
+#line 5209 "RajcePublishing.c"
 	}
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_close_album (self);
-#line 4983 "RajcePublishing.c"
+#line 5213 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the get album url transaction fails due to a network error.
      */
-static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self,
+                                                         PublishingRESTSupportTransaction* bad_txn,
+                                                         GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5002,41 +5234,46 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingR
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:619: EVENT: on_get_album_url_error");
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = bad_txn;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_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_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self);
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_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_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self);
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_close_album (self);
-#line 5015 "RajcePublishing.c"
+#line 5243 "RajcePublishing.c"
 }
 
 
 /**
      * End upload action: close album
      */
-static void _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                          GError* err,
+                                                                                                          gpointer self)
+{
 #line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_close_album_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 5025 "RajcePublishing.c"
+#line 5257 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                         gpointer self)
+{
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_close_album_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 5032 "RajcePublishing.c"
+#line 5267 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajceCloseAlbumTransaction* close_album_trans = NULL;
 	PublishingRajceSession* _tmp1_;
@@ -5071,7 +5308,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5071 "RajcePublishing.c"
+#line 5308 "RajcePublishing.c"
 	{
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5079,7 +5316,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5079 "RajcePublishing.c"
+#line 5316 "RajcePublishing.c"
 				goto __catch26_spit_publishing_publishing_error;
 			}
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5090,7 +5327,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
 			g_clear_error (&_inner_error_);
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 5090 "RajcePublishing.c"
+#line 5327 "RajcePublishing.c"
 		}
 	}
 	goto __finally26;
@@ -5110,7 +5347,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
 		publishing_rajce_rajce_publisher_do_show_error (self, _tmp6_);
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
-#line 5110 "RajcePublishing.c"
+#line 5347 "RajcePublishing.c"
 	}
 	__finally26:
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5123,25 +5360,25 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
 		g_clear_error (&_inner_error_);
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 5123 "RajcePublishing.c"
+#line 5360 "RajcePublishing.c"
 	}
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (close_album_trans);
-#line 5127 "RajcePublishing.c"
+#line 5364 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the close album completes successfully.
      */
-static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self,
+                                                          PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -5150,66 +5387,57 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 #line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:654: EVENT: on_close_album_complete");
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = txn;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_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_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self);
 #line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self);
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self);
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:657: RajcePlugin: close album: %s", _tmp6_);
+	g_debug ("RajcePublishing.vala:657: RajcePlugin: close album: %s", _tmp3_);
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp6_);
-#line 5171 "RajcePublishing.c"
+	_g_free0 (_tmp3_);
+#line 5402 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		PublishingRESTSupportXmlDocument* _tmp10_;
-		PublishingRESTSupportXmlDocument* _tmp11_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		PublishingRESTSupportXmlDocument* _tmp7_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp11_;
+		xmlNode* _tmp12_;
 		xmlNode* _tmp13_;
-		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_;
-		xmlNode* _tmp16_;
-		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_;
-		PublishingRajceSession* _tmp19_;
-		const gchar* _tmp20_;
-		PublishingRajceSession* _tmp21_;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = txn;
+		gchar* _tmp14_;
+		PublishingRajceSession* _tmp15_;
+		const gchar* _tmp16_;
+		PublishingRajceSession* _tmp17_;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+		_tmp4_ = publishing_rest_support_transaction_get_response (txn);
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp5_ = _tmp4_;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = _tmp10_;
+		_tmp7_ = _tmp6_;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp5_);
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		doc = _tmp11_;
+		doc = _tmp7_;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5209 "RajcePublishing.c"
+#line 5437 "RajcePublishing.c"
 				goto __catch27_spit_publishing_publishing_error;
 			}
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5218,29 +5446,29 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 			g_clear_error (&_inner_error_);
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 5218 "RajcePublishing.c"
+#line 5446 "RajcePublishing.c"
 		}
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = doc;
+		_tmp8_ = doc;
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+		_tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		response = _tmp13_;
+		response = _tmp9_;
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = doc;
+		_tmp11_ = doc;
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = response;
+		_tmp12_ = response;
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = _tmp17_;
+		_tmp10_ = _tmp13_;
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5240 "RajcePublishing.c"
+#line 5468 "RajcePublishing.c"
 				goto __catch27_spit_publishing_publishing_error;
 			}
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5251,33 +5479,33 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 			g_clear_error (&_inner_error_);
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 5251 "RajcePublishing.c"
+#line 5479 "RajcePublishing.c"
 		}
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+		_tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		sessionToken = _tmp18_;
+		sessionToken = _tmp14_;
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = self->priv->session;
+		_tmp15_ = self->priv->session;
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = sessionToken;
+		_tmp16_ = sessionToken;
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_usertoken (_tmp19_, _tmp20_);
+		publishing_rajce_session_set_usertoken (_tmp15_, _tmp16_);
 #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = self->priv->session;
+		_tmp17_ = self->priv->session;
 #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_session_set_albumtoken (_tmp21_, NULL);
+		publishing_rajce_session_set_albumtoken (_tmp17_, NULL);
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (sessionToken);
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5271 "RajcePublishing.c"
+#line 5499 "RajcePublishing.c"
 	}
 	goto __finally27;
 	__catch27_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp22_;
+		GError* _tmp18_;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5285,14 +5513,14 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:668: ERROR: on_close_album_complete");
 #line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = err;
+		_tmp18_ = err;
 #line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_rajce_publisher_do_show_error (self, _tmp22_);
+		publishing_rajce_rajce_publisher_do_show_error (self, _tmp18_);
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 5292 "RajcePublishing.c"
+#line 5520 "RajcePublishing.c"
 	}
 	__finally27:
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5303,22 +5531,24 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 		g_clear_error (&_inner_error_);
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 5303 "RajcePublishing.c"
+#line 5531 "RajcePublishing.c"
 	}
 #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_success_pane (self);
-#line 5307 "RajcePublishing.c"
+#line 5535 "RajcePublishing.c"
 }
 
 
 /**
      * Event triggered when the close album transaction fails due to a network error.
      */
-static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self,
+                                                       PublishingRESTSupportTransaction* bad_txn,
+                                                       GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
 #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5326,90 +5556,85 @@ static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRaj
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:680: EVENT: on_close_album_error");
 #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = bad_txn;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_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_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self);
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_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_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self);
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_success_pane (self);
-#line 5339 "RajcePublishing.c"
+#line 5565 "RajcePublishing.c"
 }
 
 
 /**
      * Action to display the success pane in the publishing dialog.
      */
-static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self)
+{
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
+	SpitPublishingPluginHost* _tmp9_;
 	SpitPublishingPluginHost* _tmp10_;
-	SpitPublishingPluginHost* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:694: ACTION: installing success pane");
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = publishing_rajce_rajce_publisher_get_show_album (self);
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp1_) {
-#line 5360 "RajcePublishing.c"
-		PublishingRajceSession* _tmp2_;
+	if (publishing_rajce_rajce_publisher_get_show_album (self)) {
+#line 5585 "RajcePublishing.c"
+		PublishingRajceSession* _tmp1_;
+		gchar* _tmp2_;
 		gchar* _tmp3_;
-		gchar* _tmp4_;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp2_ = self->priv->session;
+		_tmp1_ = self->priv->session;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3_ = publishing_rajce_session_get_albumticket (_tmp2_);
+		_tmp2_ = publishing_rajce_session_get_albumticket (_tmp1_);
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp0_ = _tmp4_ != NULL;
+		_tmp0_ = _tmp3_ != NULL;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp4_);
-#line 5374 "RajcePublishing.c"
+		_g_free0 (_tmp3_);
+#line 5599 "RajcePublishing.c"
 	} else {
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 5378 "RajcePublishing.c"
+#line 5603 "RajcePublishing.c"
 	}
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp0_) {
-#line 5382 "RajcePublishing.c"
+#line 5607 "RajcePublishing.c"
 		{
-			PublishingRajceSession* _tmp5_;
+			PublishingRajceSession* _tmp4_;
+			gchar* _tmp5_;
 			gchar* _tmp6_;
 			gchar* _tmp7_;
 			gchar* _tmp8_;
-			gchar* _tmp9_;
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp5_ = self->priv->session;
+			_tmp4_ = self->priv->session;
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp6_ = publishing_rajce_session_get_albumticket (_tmp5_);
+			_tmp5_ = publishing_rajce_session_get_albumticket (_tmp4_);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp7_ = _tmp6_;
+			_tmp6_ = _tmp5_;
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp8_ = g_strconcat ("xdg-open ", _tmp7_, NULL);
+			_tmp7_ = g_strconcat ("xdg-open ", _tmp6_, NULL);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp9_ = _tmp8_;
+			_tmp8_ = _tmp7_;
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			g_spawn_command_line_async (_tmp9_, &_inner_error_);
+			g_spawn_command_line_async (_tmp8_, &_inner_error_);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_g_free0 (_tmp9_);
+			_g_free0 (_tmp8_);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_g_free0 (_tmp7_);
+			_g_free0 (_tmp6_);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 5409 "RajcePublishing.c"
+#line 5634 "RajcePublishing.c"
 					goto __catch28_g_spawn_error;
 				}
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5418,7 +5643,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
 				g_clear_error (&_inner_error_);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				return;
-#line 5418 "RajcePublishing.c"
+#line 5643 "RajcePublishing.c"
 			}
 		}
 		goto __finally28;
@@ -5431,7 +5656,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
 			_inner_error_ = NULL;
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_g_error_free0 (e);
-#line 5431 "RajcePublishing.c"
+#line 5656 "RajcePublishing.c"
 		}
 		__finally28:
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5442,26 +5667,29 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
 			g_clear_error (&_inner_error_);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return;
-#line 5442 "RajcePublishing.c"
+#line 5667 "RajcePublishing.c"
 		}
 	}
 #line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = self->priv->host;
+	_tmp9_ = self->priv->host;
 #line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp10_, FALSE);
+	spit_publishing_plugin_host_set_service_locked (_tmp9_, FALSE);
 #line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11_ = self->priv->host;
+	_tmp10_ = self->priv->host;
 #line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_publishing_plugin_host_install_success_pane (_tmp11_);
-#line 5453 "RajcePublishing.c"
+	spit_publishing_plugin_host_install_success_pane (_tmp10_);
+#line 5678 "RajcePublishing.c"
 }
 
 
 /**
      * Helper event to handle network errors.
      */
-static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	GError* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self,
+                                                   PublishingRESTSupportTransaction* bad_txn,
+                                                   GError* err)
+{
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5469,25 +5697,24 @@ static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRa
 #line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:714: EVENT: on_network_error");
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = err;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_do_show_error (self, _tmp0_);
-#line 5472 "RajcePublishing.c"
+	publishing_rajce_rajce_publisher_do_show_error (self, err);
+#line 5698 "RajcePublishing.c"
 }
 
 
 /**
      * Action to display an error to the user.
      */
-static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self, GError* e) {
+static void
+publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self,
+                                                GError* e)
+{
 	gchar* error_type = NULL;
 	gchar* _tmp0_;
-	GError* _tmp1_;
-	const gchar* _tmp14_;
-	GError* _tmp15_;
-	const gchar* _tmp16_;
-	gchar* _tmp17_;
-	gchar* _tmp18_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5497,106 +5724,86 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce
 #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	error_type = _tmp0_;
 #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = e;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (error_type);
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 5506 "RajcePublishing.c"
+#line 5731 "RajcePublishing.c"
 	} else {
-		GError* _tmp2_;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp2_ = e;
 #line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 5513 "RajcePublishing.c"
-			gchar* _tmp3_;
+		if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
+#line 5735 "RajcePublishing.c"
+			gchar* _tmp1_;
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp3_ = g_strdup ("COMMUNICATION_FAILED");
+			_tmp1_ = g_strdup ("COMMUNICATION_FAILED");
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_g_free0 (error_type);
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			error_type = _tmp3_;
-#line 5521 "RajcePublishing.c"
+			error_type = _tmp1_;
+#line 5743 "RajcePublishing.c"
 		} else {
-			GError* _tmp4_;
 #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp4_ = e;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 5528 "RajcePublishing.c"
-				gchar* _tmp5_;
+			if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
+#line 5747 "RajcePublishing.c"
+				gchar* _tmp2_;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp5_ = g_strdup ("PROTOCOL_ERROR");
+				_tmp2_ = g_strdup ("PROTOCOL_ERROR");
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_g_free0 (error_type);
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				error_type = _tmp5_;
-#line 5536 "RajcePublishing.c"
+				error_type = _tmp2_;
+#line 5755 "RajcePublishing.c"
 			} else {
-				GError* _tmp6_;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp6_ = e;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 5543 "RajcePublishing.c"
-					gchar* _tmp7_;
+				if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
+#line 5759 "RajcePublishing.c"
+					gchar* _tmp3_;
 #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp7_ = g_strdup ("SERVICE_ERROR");
+					_tmp3_ = g_strdup ("SERVICE_ERROR");
 #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_g_free0 (error_type);
 #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					error_type = _tmp7_;
-#line 5551 "RajcePublishing.c"
+					error_type = _tmp3_;
+#line 5767 "RajcePublishing.c"
 				} else {
-					GError* _tmp8_;
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp8_ = e;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 5558 "RajcePublishing.c"
-						gchar* _tmp9_;
+					if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
+#line 5771 "RajcePublishing.c"
+						gchar* _tmp4_;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp9_ = g_strdup ("MALFORMED_RESPONSE");
+						_tmp4_ = g_strdup ("MALFORMED_RESPONSE");
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_g_free0 (error_type);
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						error_type = _tmp9_;
-#line 5566 "RajcePublishing.c"
+						error_type = _tmp4_;
+#line 5779 "RajcePublishing.c"
 					} else {
-						GError* _tmp10_;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						_tmp10_ = e;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-						if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 5573 "RajcePublishing.c"
-							gchar* _tmp11_;
+						if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
+#line 5783 "RajcePublishing.c"
+							gchar* _tmp5_;
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-							_tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
+							_tmp5_ = g_strdup ("LOCAL_FILE_ERROR");
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 							_g_free0 (error_type);
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-							error_type = _tmp11_;
-#line 5581 "RajcePublishing.c"
+							error_type = _tmp5_;
+#line 5791 "RajcePublishing.c"
 						} else {
-							GError* _tmp12_;
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-							_tmp12_ = e;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-							if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 5588 "RajcePublishing.c"
-								gchar* _tmp13_;
+							if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
+#line 5795 "RajcePublishing.c"
+								gchar* _tmp6_;
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-								_tmp13_ = g_strdup ("EXPIRED_SESSION");
+								_tmp6_ = g_strdup ("EXPIRED_SESSION");
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 								_g_free0 (error_type);
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-								error_type = _tmp13_;
-#line 5596 "RajcePublishing.c"
+								error_type = _tmp6_;
+#line 5803 "RajcePublishing.c"
 							}
 						}
 					}
@@ -5605,33 +5812,33 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce
 		}
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp14_ = error_type;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp15_ = e;
+	_tmp7_ = error_type;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp16_ = _tmp15_->message;
+	_tmp8_ = e->message;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp17_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp14_, _tmp16_);
+	_tmp9_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp7_, _tmp8_);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp18_ = _tmp17_;
+	_tmp10_ = _tmp9_;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:743: %s", _tmp18_);
+	g_debug ("RajcePublishing.vala:743: %s", _tmp10_);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp18_);
+	_g_free0 (_tmp10_);
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_error_message (self, _ ("An error message occurred when publishing to Rajce. Please try again."));
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (error_type);
-#line 5622 "RajcePublishing.c"
+#line 5827 "RajcePublishing.c"
 }
 
 
 /**
      * Action to display an error message to the user.
      */
-static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self, const gchar* message) {
+static void
+publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self,
+                                                        const gchar* message)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5641,25 +5848,27 @@ static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRa
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = message;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 5644 "RajcePublishing.c"
+	spit_publishing_plugin_host_install_static_message_pane (_tmp0_, message, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+#line 5849 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_class_init (PublishingRajceRajcePublisherClass * klass) {
+static void
+publishing_rajce_rajce_publisher_class_init (PublishingRajceRajcePublisherClass * klass)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_parent_class = g_type_class_peek_parent (klass);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRajceRajcePublisherPrivate));
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rajce_rajce_publisher_finalize;
-#line 5655 "RajcePublishing.c"
+#line 5862 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_rajce_rajce_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5670,11 +5879,13 @@ static void publishing_rajce_rajce_publisher_spit_publishing_publisher_interface
 	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_start;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_stop;
-#line 5670 "RajcePublishing.c"
+#line 5879 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajcePublisher * self) {
+static void
+publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajcePublisher * self)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_RAJCE_PUBLISHER_GET_PRIVATE (self);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5699,11 +5910,13 @@ static void publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajce
 	self->priv->parameters = NULL;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
-#line 5699 "RajcePublishing.c"
+#line 5910 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_rajce_publisher_finalize (GObject * obj) {
+static void
+publishing_rajce_rajce_publisher_finalize (GObject * obj)
+{
 	PublishingRajceRajcePublisher * self;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
@@ -5727,11 +5940,13 @@ static void publishing_rajce_rajce_publisher_finalize (GObject * obj) {
 	_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (publishing_rajce_rajce_publisher_parent_class)->finalize (obj);
-#line 5727 "RajcePublishing.c"
+#line 5940 "RajcePublishing.c"
 }
 
 
-GType publishing_rajce_rajce_publisher_get_type (void) {
+GType
+publishing_rajce_rajce_publisher_get_type (void)
+{
 	static volatile gsize publishing_rajce_rajce_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_rajce_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceRajcePublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_rajce_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceRajcePublisher), 0, (GInstanceInitFunc) publishing_rajce_rajce_publisher_instance_init, NULL };
@@ -5745,22 +5960,24 @@ GType publishing_rajce_rajce_publisher_get_type (void) {
 }
 
 
-PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount) {
+PublishingRajceAlbum*
+publishing_rajce_album_construct (GType object_type,
+                                  gint id,
+                                  const gchar* albumName,
+                                  const gchar* url,
+                                  const gchar* thumbUrl,
+                                  const gchar* createDate,
+                                  const gchar* updateDate,
+                                  gboolean hidden,
+                                  gboolean secure,
+                                  gint photoCount)
+{
 	PublishingRajceAlbum* self = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	const gchar* _tmp3_;
+	gchar* _tmp3_;
 	gchar* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	const gchar* _tmp7_;
-	gchar* _tmp8_;
-	const gchar* _tmp9_;
-	gchar* _tmp10_;
-	gboolean _tmp11_;
-	gboolean _tmp12_;
-	gint _tmp13_;
 #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (albumName != NULL, NULL);
 #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5774,102 +5991,87 @@ PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint
 #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajceAlbum*) g_type_create_instance (object_type);
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = id;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->id = _tmp0_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = albumName;
+	self->id = id;
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp0_ = g_strdup (albumName);
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->albumName);
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->albumName = _tmp2_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = url;
+	self->albumName = _tmp0_;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp1_ = g_strdup (url);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->url);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->url = _tmp4_;
+	self->url = _tmp1_;
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = thumbUrl;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp2_ = g_strdup (thumbUrl);
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->thumbUrl);
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->thumbUrl = _tmp6_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = createDate;
+	self->thumbUrl = _tmp2_;
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = g_strdup (_tmp7_);
+	_tmp3_ = g_strdup (createDate);
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->createDate);
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->createDate = _tmp8_;
+	self->createDate = _tmp3_;
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = updateDate;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = g_strdup (_tmp9_);
+	_tmp4_ = g_strdup (updateDate);
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->updateDate);
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->updateDate = _tmp10_;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11_ = hidden;
+	self->updateDate = _tmp4_;
 #line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->hidden = _tmp11_;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp12_ = secure;
+	self->hidden = hidden;
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->secure = _tmp12_;
+	self->secure = secure;
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp13_ = photoCount;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->photoCount = _tmp13_;
+	self->photoCount = photoCount;
 #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 5831 "RajcePublishing.c"
+#line 6030 "RajcePublishing.c"
 }
 
 
-PublishingRajceAlbum* publishing_rajce_album_new (gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount) {
+PublishingRajceAlbum*
+publishing_rajce_album_new (gint id,
+                            const gchar* albumName,
+                            const gchar* url,
+                            const gchar* thumbUrl,
+                            const gchar* createDate,
+                            const gchar* updateDate,
+                            gboolean hidden,
+                            gboolean secure,
+                            gint photoCount)
+{
 #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_album_construct (PUBLISHING_RAJCE_TYPE_ALBUM, id, albumName, url, thumbUrl, createDate, updateDate, hidden, secure, photoCount);
-#line 5838 "RajcePublishing.c"
+#line 6047 "RajcePublishing.c"
 }
 
 
-gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingRajceAlbum* b) {
+gint
+publishing_rajce_album_compare_albums (PublishingRajceAlbum* a,
+                                       PublishingRajceAlbum* b)
+{
 	gint result = 0;
 	gboolean _tmp0_ = FALSE;
-	PublishingRajceAlbum* _tmp1_;
-	PublishingRajceAlbum* _tmp9_;
-	const gchar* _tmp10_;
-	PublishingRajceAlbum* _tmp11_;
-	const gchar* _tmp12_;
-	gint _tmp13_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail ((a == NULL) || PUBLISHING_RAJCE_IS_ALBUM (a), 0);
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail ((b == NULL) || PUBLISHING_RAJCE_IS_ALBUM (b), 0);
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = a;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp1_ == NULL) {
-#line 5859 "RajcePublishing.c"
-		PublishingRajceAlbum* _tmp2_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp2_ = b;
+	if (a == NULL) {
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp0_ = _tmp2_ == NULL;
-#line 5865 "RajcePublishing.c"
+		_tmp0_ = b == NULL;
+#line 6067 "RajcePublishing.c"
 	} else {
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 5869 "RajcePublishing.c"
+#line 6071 "RajcePublishing.c"
 	}
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp0_) {
@@ -5877,178 +6079,183 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR
 		result = 0;
 #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 5877 "RajcePublishing.c"
+#line 6079 "RajcePublishing.c"
 	} else {
-		gboolean _tmp3_ = FALSE;
-		PublishingRajceAlbum* _tmp4_;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = a;
+		gboolean _tmp1_ = FALSE;
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp4_ == NULL) {
-#line 5885 "RajcePublishing.c"
-			PublishingRajceAlbum* _tmp5_;
+		if (a == NULL) {
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp5_ = b;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp3_ = _tmp5_ != NULL;
-#line 5891 "RajcePublishing.c"
+			_tmp1_ = b != NULL;
+#line 6086 "RajcePublishing.c"
 		} else {
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp3_ = FALSE;
-#line 5895 "RajcePublishing.c"
+			_tmp1_ = FALSE;
+#line 6090 "RajcePublishing.c"
 		}
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp3_) {
+		if (_tmp1_) {
 #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			result = 1;
 #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return result;
-#line 5903 "RajcePublishing.c"
+#line 6098 "RajcePublishing.c"
 		} else {
-			gboolean _tmp6_ = FALSE;
-			PublishingRajceAlbum* _tmp7_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp7_ = a;
+			gboolean _tmp2_ = FALSE;
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			if (_tmp7_ != NULL) {
-#line 5911 "RajcePublishing.c"
-				PublishingRajceAlbum* _tmp8_;
+			if (a != NULL) {
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp8_ = b;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp6_ = _tmp8_ == NULL;
-#line 5917 "RajcePublishing.c"
+				_tmp2_ = b == NULL;
+#line 6105 "RajcePublishing.c"
 			} else {
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp6_ = FALSE;
-#line 5921 "RajcePublishing.c"
+				_tmp2_ = FALSE;
+#line 6109 "RajcePublishing.c"
 			}
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			if (_tmp6_) {
+			if (_tmp2_) {
 #line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				result = -1;
 #line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				return result;
-#line 5929 "RajcePublishing.c"
+#line 6117 "RajcePublishing.c"
 			}
 		}
 	}
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = b;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = _tmp9_->updateDate;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11_ = a;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp12_ = _tmp11_->updateDate;
+	_tmp3_ = b->updateDate;
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp13_ = g_ascii_strcasecmp (_tmp10_, _tmp12_);
+	_tmp4_ = a->updateDate;
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	result = _tmp13_;
+	result = g_ascii_strcasecmp (_tmp3_, _tmp4_);
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 5947 "RajcePublishing.c"
+#line 6129 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_value_album_init (GValue* value) {
+static void
+publishing_rajce_value_album_init (GValue* value)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5954 "RajcePublishing.c"
+#line 6138 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_value_album_free_value (GValue* value) {
+static void
+publishing_rajce_value_album_free_value (GValue* value)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_album_unref (value->data[0].v_pointer);
-#line 5963 "RajcePublishing.c"
+#line 6149 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_album_copy_value (const GValue* src_value,
+                                         GValue* dest_value)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_rajce_album_ref (src_value->data[0].v_pointer);
-#line 5973 "RajcePublishing.c"
+#line 6162 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5977 "RajcePublishing.c"
+#line 6166 "RajcePublishing.c"
 	}
 }
 
 
-static gpointer publishing_rajce_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_album_peek_pointer (const GValue* value)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 5985 "RajcePublishing.c"
+#line 6176 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_album_collect_value (GValue* value,
+                                            guint n_collect_values,
+                                            GTypeCValue* collect_values,
+                                            guint collect_flags)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5992 "RajcePublishing.c"
+#line 6188 "RajcePublishing.c"
 		PublishingRajceAlbum * object;
 		object = collect_values[0].v_pointer;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5999 "RajcePublishing.c"
+#line 6195 "RajcePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 6003 "RajcePublishing.c"
+#line 6199 "RajcePublishing.c"
 		}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = publishing_rajce_album_ref (object);
-#line 6007 "RajcePublishing.c"
+#line 6203 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6011 "RajcePublishing.c"
+#line 6207 "RajcePublishing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 6015 "RajcePublishing.c"
+#line 6211 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_album_lcopy_value (const GValue* value,
+                                          guint n_collect_values,
+                                          GTypeCValue* collect_values,
+                                          guint collect_flags)
+{
 	PublishingRajceAlbum ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!object_p) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6026 "RajcePublishing.c"
+#line 6227 "RajcePublishing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = NULL;
-#line 6032 "RajcePublishing.c"
+#line 6233 "RajcePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6036 "RajcePublishing.c"
+#line 6237 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = publishing_rajce_album_ref (value->data[0].v_pointer);
-#line 6040 "RajcePublishing.c"
+#line 6241 "RajcePublishing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 6044 "RajcePublishing.c"
+#line 6245 "RajcePublishing.c"
 }
 
 
-GParamSpec* publishing_rajce_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_album (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags)
+{
 	PublishingRajceParamSpecAlbum* spec;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_ALBUM), NULL);
@@ -6058,20 +6265,25 @@ GParamSpec* publishing_rajce_param_spec_album (const gchar* name, const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6058 "RajcePublishing.c"
+#line 6265 "RajcePublishing.c"
 }
 
 
-gpointer publishing_rajce_value_get_album (const GValue* value) {
+gpointer
+publishing_rajce_value_get_album (const GValue* value)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM), NULL);
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 6067 "RajcePublishing.c"
+#line 6276 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_album (GValue* value,
+                                  gpointer v_object)
+{
 	PublishingRajceAlbum * old;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM));
@@ -6087,22 +6299,25 @@ void publishing_rajce_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_album_ref (value->data[0].v_pointer);
-#line 6087 "RajcePublishing.c"
+#line 6299 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6091 "RajcePublishing.c"
+#line 6303 "RajcePublishing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_album_unref (old);
-#line 6097 "RajcePublishing.c"
+#line 6309 "RajcePublishing.c"
 	}
 }
 
 
-void publishing_rajce_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_album (GValue* value,
+                                   gpointer v_object)
+{
 	PublishingRajceAlbum * old;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM));
@@ -6116,38 +6331,44 @@ void publishing_rajce_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 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6116 "RajcePublishing.c"
+#line 6331 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6120 "RajcePublishing.c"
+#line 6335 "RajcePublishing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_album_unref (old);
-#line 6126 "RajcePublishing.c"
+#line 6341 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_album_class_init (PublishingRajceAlbumClass * klass) {
+static void
+publishing_rajce_album_class_init (PublishingRajceAlbumClass * klass)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_album_parent_class = g_type_class_peek_parent (klass);
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRajceAlbumClass *) klass)->finalize = publishing_rajce_album_finalize;
-#line 6136 "RajcePublishing.c"
+#line 6353 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_album_instance_init (PublishingRajceAlbum * self) {
+static void
+publishing_rajce_album_instance_init (PublishingRajceAlbum * self)
+{
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->ref_count = 1;
-#line 6143 "RajcePublishing.c"
+#line 6362 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj) {
+static void
+publishing_rajce_album_finalize (PublishingRajceAlbum * obj)
+{
 	PublishingRajceAlbum * self;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ALBUM, PublishingRajceAlbum);
@@ -6163,11 +6384,13 @@ static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj) {
 	_g_free0 (self->createDate);
 #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->updateDate);
-#line 6163 "RajcePublishing.c"
+#line 6384 "RajcePublishing.c"
 }
 
 
-GType publishing_rajce_album_get_type (void) {
+GType
+publishing_rajce_album_get_type (void)
+{
 	static volatile gsize publishing_rajce_album_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_album_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_album_init, publishing_rajce_value_album_free_value, publishing_rajce_value_album_copy_value, publishing_rajce_value_album_peek_pointer, "p", publishing_rajce_value_album_collect_value, "p", publishing_rajce_value_album_lcopy_value };
@@ -6181,18 +6404,22 @@ GType publishing_rajce_album_get_type (void) {
 }
 
 
-gpointer publishing_rajce_album_ref (gpointer instance) {
+gpointer
+publishing_rajce_album_ref (gpointer instance)
+{
 	PublishingRajceAlbum * self;
 	self = instance;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return instance;
-#line 6188 "RajcePublishing.c"
+#line 6413 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_album_unref (gpointer instance) {
+void
+publishing_rajce_album_unref (gpointer instance)
+{
 	PublishingRajceAlbum * self;
 	self = instance;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6201,20 +6428,22 @@ void publishing_rajce_album_unref (gpointer instance) {
 		PUBLISHING_RAJCE_ALBUM_GET_CLASS (self)->finalize (self);
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6201 "RajcePublishing.c"
+#line 6428 "RajcePublishing.c"
 	}
 }
 
 
-PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type, PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters) {
+PublishingRajceUploader*
+publishing_rajce_uploader_construct (GType object_type,
+                                     PublishingRajceSession* session,
+                                     const gchar* url,
+                                     SpitPublishingPublishable** publishables,
+                                     int publishables_length1,
+                                     PublishingRajcePublishingParameters* parameters)
+{
 	PublishingRajceUploader* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingRajcePublishingParameters* _tmp2_;
-	PublishingRajcePublishingParameters* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
+	PublishingRajcePublishingParameters* _tmp0_;
+	gchar* _tmp1_;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6222,52 +6451,50 @@ PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type,
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
 #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = publishables;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1__length1 = publishables_length1;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
+	self = (PublishingRajceUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = parameters;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = _publishing_rajce_publishing_parameters_ref0 (_tmp2_);
+	_tmp0_ = _publishing_rajce_publishing_parameters_ref0 (parameters);
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->parameters = _tmp3_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = url;
+	self->priv->parameters = _tmp0_;
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp1_ = g_strdup (url);
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->url);
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->url = _tmp5_;
+	self->priv->url = _tmp1_;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 6247 "RajcePublishing.c"
+#line 6466 "RajcePublishing.c"
 }
 
 
-PublishingRajceUploader* publishing_rajce_uploader_new (PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters) {
+PublishingRajceUploader*
+publishing_rajce_uploader_new (PublishingRajceSession* session,
+                               const gchar* url,
+                               SpitPublishingPublishable** publishables,
+                               int publishables_length1,
+                               PublishingRajcePublishingParameters* parameters)
+{
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_uploader_construct (PUBLISHING_RAJCE_TYPE_UPLOADER, session, url, publishables, publishables_length1, parameters);
-#line 6254 "RajcePublishing.c"
+#line 6479 "RajcePublishing.c"
 }
 
 
-static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                   SpitPublishingPublishable* publishable)
+{
 	PublishingRajceUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	PublishingRESTSupportSession* _tmp0_;
 	PublishingRajceSession* _tmp1_;
 	const gchar* _tmp2_;
 	PublishingRajcePublishingParameters* _tmp3_;
-	SpitPublishingPublishable* _tmp4_;
-	PublishingRajceAddPhotoTransaction* _tmp5_;
-	PublishingRESTSupportTransaction* _tmp6_;
+	PublishingRajceAddPhotoTransaction* _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploader);
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6281,22 +6508,22 @@ static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_t
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = self->priv->parameters;
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishable;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = publishing_rajce_add_photo_transaction_new (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
+	_tmp4_ = publishing_rajce_add_photo_transaction_new (_tmp1_, _tmp2_, _tmp3_, publishable);
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	result = _tmp6_;
+	result = _tmp5_;
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6292 "RajcePublishing.c"
+#line 6517 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_uploader_class_init (PublishingRajceUploaderClass * klass) {
+static void
+publishing_rajce_uploader_class_init (PublishingRajceUploaderClass * klass)
+{
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_uploader_parent_class = g_type_class_peek_parent (klass);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6305,18 +6532,22 @@ static void publishing_rajce_uploader_class_init (PublishingRajceUploaderClass *
 	g_type_class_add_private (klass, sizeof (PublishingRajceUploaderPrivate));
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rajce_uploader_real_create_transaction;
-#line 6305 "RajcePublishing.c"
+#line 6532 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_uploader_instance_init (PublishingRajceUploader * self) {
+static void
+publishing_rajce_uploader_instance_init (PublishingRajceUploader * self)
+{
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_UPLOADER_GET_PRIVATE (self);
-#line 6312 "RajcePublishing.c"
+#line 6541 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
 	PublishingRajceUploader * self;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploader);
@@ -6326,11 +6557,13 @@ static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUpload
 	_g_free0 (self->priv->url);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_rajce_uploader_parent_class)->finalize (obj);
-#line 6326 "RajcePublishing.c"
+#line 6557 "RajcePublishing.c"
 }
 
 
-GType publishing_rajce_uploader_get_type (void) {
+GType
+publishing_rajce_uploader_get_type (void)
+{
 	static volatile gsize publishing_rajce_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_uploader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceUploader), 0, (GInstanceInitFunc) publishing_rajce_uploader_instance_init, NULL };
@@ -6342,7 +6575,9 @@ GType publishing_rajce_uploader_get_type (void) {
 }
 
 
-GType publishing_rajce_authentication_pane_mode_get_type (void) {
+GType
+publishing_rajce_authentication_pane_mode_get_type (void)
+{
 	static volatile gsize publishing_rajce_authentication_pane_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_authentication_pane_mode_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
@@ -6354,28 +6589,41 @@ GType publishing_rajce_authentication_pane_mode_get_type (void) {
 }
 
 
-static void _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                            gpointer self)
+{
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_on_user_changed ((PublishingRajceAuthenticationPane*) self);
-#line 6357 "RajcePublishing.c"
+#line 6595 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                gpointer self)
+{
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_on_password_changed ((PublishingRajceAuthenticationPane*) self);
-#line 6364 "RajcePublishing.c"
+#line 6605 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                  gpointer self)
+{
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_on_login_button_clicked ((PublishingRajceAuthenticationPane*) self);
-#line 6371 "RajcePublishing.c"
+#line 6615 "RajcePublishing.c"
 }
 
 
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) {
+PublishingRajceAuthenticationPane*
+publishing_rajce_authentication_pane_construct (GType object_type,
+                                                PublishingRajceRajcePublisher* publisher,
+                                                PublishingRajceAuthenticationPaneMode mode)
+{
 	PublishingRajceAuthenticationPane * self = NULL;
 	GtkBox* _tmp0_;
 	GError * _inner_error_ = NULL;
@@ -6391,7 +6639,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 	_g_object_unref0 (self->priv->pane_widget);
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->pane_widget = _tmp0_;
-#line 6391 "RajcePublishing.c"
+#line 6639 "RajcePublishing.c"
 	{
 		GtkBuilder* _tmp1_;
 		GtkBuilder* _tmp2_;
@@ -6404,55 +6652,49 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		GtkBuilder* _tmp7_;
 		GObject* _tmp8_;
 		GtkLabel* _tmp9_;
-		PublishingRajceAuthenticationPaneMode _tmp10_;
-		GtkBuilder* _tmp17_;
-		GObject* _tmp18_;
-		GtkEntry* _tmp19_;
+		GtkBuilder* _tmp16_;
+		GObject* _tmp17_;
+		GtkEntry* _tmp18_;
 		gchar* persistent_username = NULL;
-		PublishingRajceRajcePublisher* _tmp20_;
-		gchar* _tmp21_;
-		const gchar* _tmp22_;
-		GtkBuilder* _tmp25_;
-		GObject* _tmp26_;
-		GtkEntry* _tmp27_;
+		gchar* _tmp19_;
+		const gchar* _tmp20_;
+		GtkBuilder* _tmp23_;
+		GObject* _tmp24_;
+		GtkEntry* _tmp25_;
 		gchar* persistent_token = NULL;
-		PublishingRajceRajcePublisher* _tmp28_;
-		gchar* _tmp29_;
-		const gchar* _tmp30_;
-		GtkBuilder* _tmp33_;
-		GObject* _tmp34_;
-		GtkCheckButton* _tmp35_;
-		GtkCheckButton* _tmp36_;
-		PublishingRajceRajcePublisher* _tmp37_;
-		gboolean _tmp38_;
-		GtkBuilder* _tmp39_;
-		GObject* _tmp40_;
-		GtkButton* _tmp41_;
+		gchar* _tmp26_;
+		const gchar* _tmp27_;
+		GtkBuilder* _tmp30_;
+		GObject* _tmp31_;
+		GtkCheckButton* _tmp32_;
+		GtkCheckButton* _tmp33_;
+		GtkBuilder* _tmp34_;
+		GObject* _tmp35_;
+		GtkButton* _tmp36_;
 		GtkLabel* label2 = NULL;
-		GtkBuilder* _tmp42_;
-		GObject* _tmp43_;
-		GtkLabel* _tmp44_;
+		GtkBuilder* _tmp37_;
+		GObject* _tmp38_;
+		GtkLabel* _tmp39_;
 		GtkLabel* label3 = NULL;
-		GtkBuilder* _tmp45_;
-		GObject* _tmp46_;
-		GtkLabel* _tmp47_;
-		GtkLabel* _tmp48_;
-		GtkLabel* _tmp49_;
-		GtkCheckButton* _tmp50_;
-		GtkButton* _tmp51_;
-		GtkEntry* _tmp52_;
-		GtkEntry* _tmp53_;
-		GtkButton* _tmp54_;
+		GtkBuilder* _tmp40_;
+		GObject* _tmp41_;
+		GtkLabel* _tmp42_;
+		GtkLabel* _tmp43_;
+		GtkLabel* _tmp44_;
+		GtkCheckButton* _tmp45_;
+		GtkButton* _tmp46_;
+		GtkEntry* _tmp47_;
+		GtkEntry* _tmp48_;
+		GtkButton* _tmp49_;
+		GtkBox* _tmp50_;
+		GtkContainer* _tmp51_;
+		GtkContainer* _tmp52_;
+		GtkBox* _tmp53_;
+		GtkBox* _tmp54_;
 		GtkBox* _tmp55_;
-		GtkContainer* _tmp56_;
-		GtkContainer* _tmp57_;
-		GtkBox* _tmp58_;
-		GtkBox* _tmp59_;
-		GtkBox* _tmp60_;
-		PublishingRajceRajcePublisher* _tmp61_;
-		SpitPublishingPluginHost* _tmp62_;
-		SpitPublishingPluginHost* _tmp63_;
-		GtkButton* _tmp64_;
+		SpitPublishingPluginHost* _tmp56_;
+		SpitPublishingPluginHost* _tmp57_;
+		GtkButton* _tmp58_;
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp1_ = gtk_builder_new ();
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6465,7 +6707,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/rajce_authentication_pane.ui", &_inner_error_);
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6465 "RajcePublishing.c"
+#line 6707 "RajcePublishing.c"
 			goto __catch29_g_error;
 		}
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6489,222 +6731,210 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		message_label = _tmp9_;
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = mode;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		switch (_tmp10_) {
+		switch (mode) {
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO:
-#line 6494 "RajcePublishing.c"
+#line 6734 "RajcePublishing.c"
 			{
-				GtkLabel* _tmp11_;
-				const gchar* _tmp12_;
+				GtkLabel* _tmp10_;
+				const gchar* _tmp11_;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp11_ = message_label;
+				_tmp10_ = message_label;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp12_ = publishing_rajce_authentication_pane_INTRO_MESSAGE;
+				_tmp11_ = publishing_rajce_authentication_pane_INTRO_MESSAGE;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				gtk_label_set_text (_tmp11_, _tmp12_);
+				gtk_label_set_text (_tmp10_, _tmp11_);
 #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				break;
-#line 6506 "RajcePublishing.c"
+#line 6746 "RajcePublishing.c"
 			}
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 6510 "RajcePublishing.c"
+#line 6750 "RajcePublishing.c"
 			{
-				GtkLabel* _tmp13_;
-				const gchar* _tmp14_;
+				GtkLabel* _tmp12_;
+				const gchar* _tmp13_;
+				gchar* _tmp14_;
 				gchar* _tmp15_;
-				gchar* _tmp16_;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp13_ = message_label;
+				_tmp12_ = message_label;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp14_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+				_tmp13_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Email or Password"), _tmp14_);
+				_tmp14_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Email or Password"), _tmp13_);
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp16_ = _tmp15_;
+				_tmp15_ = _tmp14_;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				gtk_label_set_markup (_tmp13_, _tmp16_);
+				gtk_label_set_markup (_tmp12_, _tmp15_);
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_g_free0 (_tmp16_);
+				_g_free0 (_tmp15_);
 #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				break;
-#line 6530 "RajcePublishing.c"
+#line 6770 "RajcePublishing.c"
 			}
 			default:
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			break;
-#line 6535 "RajcePublishing.c"
+#line 6775 "RajcePublishing.c"
 		}
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = self->priv->builder;
+		_tmp16_ = self->priv->builder;
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
+		_tmp17_ = gtk_builder_get_object (_tmp16_, "username_entry");
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp17_) : NULL);
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->username_entry);
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->username_entry = _tmp19_;
-#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = publisher;
+		self->priv->username_entry = _tmp18_;
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = publishing_rajce_rajce_publisher_get_username (_tmp20_);
+		_tmp19_ = publishing_rajce_rajce_publisher_get_username (publisher);
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		persistent_username = _tmp21_;
+		persistent_username = _tmp19_;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = persistent_username;
+		_tmp20_ = persistent_username;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp22_ != NULL) {
-#line 6557 "RajcePublishing.c"
-			GtkEntry* _tmp23_;
-			const gchar* _tmp24_;
+		if (_tmp20_ != NULL) {
+#line 6795 "RajcePublishing.c"
+			GtkEntry* _tmp21_;
+			const gchar* _tmp22_;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp23_ = self->priv->username_entry;
+			_tmp21_ = self->priv->username_entry;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp24_ = persistent_username;
+			_tmp22_ = persistent_username;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			gtk_entry_set_text (_tmp23_, _tmp24_);
-#line 6566 "RajcePublishing.c"
+			gtk_entry_set_text (_tmp21_, _tmp22_);
+#line 6804 "RajcePublishing.c"
 		}
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp25_ = self->priv->builder;
+		_tmp23_ = self->priv->builder;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = gtk_builder_get_object (_tmp25_, "password_entry");
+		_tmp24_ = gtk_builder_get_object (_tmp23_, "password_entry");
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
+		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->password_entry);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->password_entry = _tmp27_;
-#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_ = publisher;
+		self->priv->password_entry = _tmp25_;
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp29_ = publishing_rajce_rajce_publisher_get_token (_tmp28_);
+		_tmp26_ = publishing_rajce_rajce_publisher_get_token (publisher);
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		persistent_token = _tmp29_;
+		persistent_token = _tmp26_;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp30_ = persistent_token;
+		_tmp27_ = persistent_token;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp30_ != NULL) {
-#line 6588 "RajcePublishing.c"
-			GtkEntry* _tmp31_;
-			const gchar* _tmp32_;
+		if (_tmp27_ != NULL) {
+#line 6824 "RajcePublishing.c"
+			GtkEntry* _tmp28_;
+			const gchar* _tmp29_;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp31_ = self->priv->password_entry;
+			_tmp28_ = self->priv->password_entry;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp32_ = persistent_token;
+			_tmp29_ = persistent_token;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			gtk_entry_set_text (_tmp31_, _tmp32_);
+			gtk_entry_set_text (_tmp28_, _tmp29_);
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			self->priv->crypt = FALSE;
-#line 6599 "RajcePublishing.c"
+#line 6835 "RajcePublishing.c"
 		} else {
 #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			self->priv->crypt = TRUE;
-#line 6603 "RajcePublishing.c"
+#line 6839 "RajcePublishing.c"
 		}
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp33_ = self->priv->builder;
+		_tmp30_ = self->priv->builder;
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp34_ = gtk_builder_get_object (_tmp33_, "remember_checkbutton");
+		_tmp31_ = gtk_builder_get_object (_tmp30_, "remember_checkbutton");
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp34_) : NULL);
+		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp31_) : NULL);
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->remember_checkbutton);
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->remember_checkbutton = _tmp35_;
+		self->priv->remember_checkbutton = _tmp32_;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp36_ = self->priv->remember_checkbutton;
+		_tmp33_ = self->priv->remember_checkbutton;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp37_ = publisher;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp38_ = publishing_rajce_rajce_publisher_get_remember (_tmp37_);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp38_);
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_rajce_rajce_publisher_get_remember (publisher));
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp39_ = self->priv->builder;
+		_tmp34_ = self->priv->builder;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp40_ = gtk_builder_get_object (_tmp39_, "login_button");
+		_tmp35_ = gtk_builder_get_object (_tmp34_, "login_button");
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_button_get_type ()) ? ((GtkButton*) _tmp40_) : NULL);
+		_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_button_get_type ()) ? ((GtkButton*) _tmp35_) : NULL);
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->login_button);
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->login_button = _tmp41_;
+		self->priv->login_button = _tmp36_;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp42_ = self->priv->builder;
+		_tmp37_ = self->priv->builder;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp43_ = gtk_builder_get_object (_tmp42_, "label2");
+		_tmp38_ = gtk_builder_get_object (_tmp37_, "label2");
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp43_) : NULL);
+		_tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp38_) : NULL);
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		label2 = _tmp44_;
+		label2 = _tmp39_;
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp45_ = self->priv->builder;
+		_tmp40_ = self->priv->builder;
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp46_ = gtk_builder_get_object (_tmp45_, "label3");
+		_tmp41_ = gtk_builder_get_object (_tmp40_, "label3");
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp46_) : NULL);
+		_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp41_) : NULL);
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		label3 = _tmp47_;
+		label3 = _tmp42_;
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp48_ = label2;
+		_tmp43_ = label2;
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp48_, _ ("_Email address"));
+		gtk_label_set_label (_tmp43_, _ ("_Email address"));
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp49_ = label3;
+		_tmp44_ = label3;
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp49_, _ ("_Password"));
+		gtk_label_set_label (_tmp44_, _ ("_Password"));
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp50_ = self->priv->remember_checkbutton;
+		_tmp45_ = self->priv->remember_checkbutton;
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_button_get_type (), GtkButton), _ ("_Remember"));
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_button_get_type (), GtkButton), _ ("_Remember"));
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp51_ = self->priv->login_button;
+		_tmp46_ = self->priv->login_button;
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (_tmp51_, _ ("Log in"));
+		gtk_button_set_label (_tmp46_, _ ("Log in"));
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp52_ = self->priv->username_entry;
+		_tmp47_ = self->priv->username_entry;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_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_rajce_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp53_ = self->priv->password_entry;
+		_tmp48_ = self->priv->password_entry;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp54_ = self->priv->login_button;
+		_tmp49_ = self->priv->login_button;
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (_tmp54_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp49_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp55_ = content;
+		_tmp50_ = content;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp56_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
+		_tmp51_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp57_ = _tmp56_;
+		_tmp52_ = _tmp51_;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp58_ = content;
+		_tmp53_ = content;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_container_remove (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_remove (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp59_ = self->priv->pane_widget;
+		_tmp54_ = self->priv->pane_widget;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp60_ = content;
+		_tmp55_ = content;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp61_ = publisher;
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp62_ = publishing_rajce_rajce_publisher_get_host (_tmp61_);
+		_tmp56_ = publishing_rajce_rajce_publisher_get_host (publisher);
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp63_ = _tmp62_;
+		_tmp57_ = _tmp56_;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp64_ = self->priv->login_button;
+		_tmp58_ = self->priv->login_button;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
+		spit_publishing_plugin_host_set_dialog_default_widget (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_object_unref0 (_tmp63_);
+		_g_object_unref0 (_tmp57_);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (label3);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6717,27 +6947,27 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		_g_object_unref0 (message_label);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (content);
-#line 6717 "RajcePublishing.c"
+#line 6947 "RajcePublishing.c"
 	}
 	goto __finally29;
 	__catch29_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp65_;
-		const gchar* _tmp66_;
+		GError* _tmp59_;
+		const gchar* _tmp60_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		e = _inner_error_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_inner_error_ = NULL;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp65_ = e;
+		_tmp59_ = e;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp66_ = _tmp65_->message;
+		_tmp60_ = _tmp59_->message;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp66_);
+		g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp60_);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (e);
-#line 6737 "RajcePublishing.c"
+#line 6967 "RajcePublishing.c"
 	}
 	__finally29:
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6748,22 +6978,27 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		g_clear_error (&_inner_error_);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return NULL;
-#line 6748 "RajcePublishing.c"
+#line 6978 "RajcePublishing.c"
 	}
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 6752 "RajcePublishing.c"
+#line 6982 "RajcePublishing.c"
 }
 
 
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) {
+PublishingRajceAuthenticationPane*
+publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher,
+                                          PublishingRajceAuthenticationPaneMode mode)
+{
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_authentication_pane_construct (PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 6759 "RajcePublishing.c"
+#line 6992 "RajcePublishing.c"
 }
 
 
-GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self) {
+GtkWidget*
+publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self)
+{
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_;
 	GtkWidget* _tmp1_;
@@ -6777,11 +7012,13 @@ GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRa
 	result = _tmp1_;
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6777 "RajcePublishing.c"
+#line 7012 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self)
+{
 	gchar* token = NULL;
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
@@ -6791,7 +7028,6 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
 	const gchar* _tmp7_;
 	const gchar* _tmp8_;
 	GtkCheckButton* _tmp9_;
-	gboolean _tmp10_;
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6806,7 +7042,7 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
 	_tmp3_ = self->priv->crypt;
 #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp3_) {
-#line 6806 "RajcePublishing.c"
+#line 7042 "RajcePublishing.c"
 		const gchar* _tmp4_;
 		gchar* _tmp5_;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6817,7 +7053,7 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
 		_g_free0 (token);
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		token = _tmp5_;
-#line 6817 "RajcePublishing.c"
+#line 7053 "RajcePublishing.c"
 	}
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = self->priv->username_entry;
@@ -6828,36 +7064,40 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = self->priv->remember_checkbutton;
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_emit (self, publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp7_, _tmp8_, _tmp10_);
+	g_signal_emit (self, publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp7_, _tmp8_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)));
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (token);
-#line 6833 "RajcePublishing.c"
+#line 7067 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self)
+{
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
 #line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6842 "RajcePublishing.c"
+#line 7078 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self)
+{
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->crypt = TRUE;
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6853 "RajcePublishing.c"
+#line 7091 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self)
+{
 	gboolean _tmp0_ = FALSE;
 	GtkEntry* _tmp1_;
 	guint _tmp2_;
@@ -6873,7 +7113,7 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity
 	_tmp3_ = _tmp2_;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp3_ > ((guint) 0)) {
-#line 6873 "RajcePublishing.c"
+#line 7113 "RajcePublishing.c"
 		GtkEntry* _tmp4_;
 		guint _tmp5_;
 		guint _tmp6_;
@@ -6885,21 +7125,23 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity
 		_tmp6_ = _tmp5_;
 #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 6885 "RajcePublishing.c"
+#line 7125 "RajcePublishing.c"
 	} else {
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 6889 "RajcePublishing.c"
+#line 7129 "RajcePublishing.c"
 	}
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = self->priv->login_button;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 6895 "RajcePublishing.c"
+#line 7135 "RajcePublishing.c"
 }
 
 
-static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingRajceAuthenticationPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -6914,11 +7156,13 @@ static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPubl
 	result = _tmp1_;
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6914 "RajcePublishing.c"
+#line 7156 "RajcePublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingRajceAuthenticationPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6927,11 +7171,13 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_p
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6927 "RajcePublishing.c"
+#line 7171 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingRajceAuthenticationPane * self;
 	GtkEntry* _tmp0_;
 	GtkEntry* _tmp1_;
@@ -6952,19 +7198,28 @@ static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPub
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6952 "RajcePublishing.c"
+#line 7198 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingRajceAuthenticationPane * self;
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
-#line 6960 "RajcePublishing.c"
+#line 7208 "RajcePublishing.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__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_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_BOOLEAN) (gpointer data1, const char* arg_1, const char* arg_2, gboolean arg_3, gpointer data2);
 	register GMarshalFunc_VOID__STRING_STRING_BOOLEAN callback;
 	register GCClosure * cc;
@@ -6979,23 +7234,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * clos
 		data1 = closure->data;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 6979 "RajcePublishing.c"
+#line 7234 "RajcePublishing.c"
 	} else {
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = closure->data;
-#line 6985 "RajcePublishing.c"
+#line 7240 "RajcePublishing.c"
 	}
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_boolean (param_values + 3), data2);
-#line 6991 "RajcePublishing.c"
+#line 7246 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuthenticationPaneClass * klass) {
+static void
+publishing_rajce_authentication_pane_class_init (PublishingRajceAuthenticationPaneClass * klass)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7014,11 +7271,13 @@ static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuth
 	_tmp1_ = g_strdup (_ ("Invalid email and/or password. Please try again"));
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
-#line 7014 "RajcePublishing.c"
+#line 7271 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_rajce_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7029,22 +7288,26 @@ static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_int
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_on_pane_installed;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_on_pane_uninstalled;
-#line 7029 "RajcePublishing.c"
+#line 7288 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_instance_init (PublishingRajceAuthenticationPane * self) {
+static void
+publishing_rajce_authentication_pane_instance_init (PublishingRajceAuthenticationPane * self)
+{
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_AUTHENTICATION_PANE_GET_PRIVATE (self);
 #line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->pane_widget = NULL;
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->crypt = TRUE;
-#line 7040 "RajcePublishing.c"
+#line 7301 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_rajce_authentication_pane_finalize (GObject * obj)
+{
 	PublishingRajceAuthenticationPane * self;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
@@ -7062,7 +7325,7 @@ static void publishing_rajce_authentication_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->login_button);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (publishing_rajce_authentication_pane_parent_class)->finalize (obj);
-#line 7062 "RajcePublishing.c"
+#line 7325 "RajcePublishing.c"
 }
 
 
@@ -7070,7 +7333,9 @@ static void publishing_rajce_authentication_pane_finalize (GObject * obj) {
  * The authentication pane used when asking service URL, user name and password
  * from the user.
  */
-GType publishing_rajce_authentication_pane_get_type (void) {
+GType
+publishing_rajce_authentication_pane_get_type (void)
+{
 	static volatile gsize publishing_rajce_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceAuthenticationPane), 0, (GInstanceInitFunc) publishing_rajce_authentication_pane_instance_init, NULL };
@@ -7084,80 +7349,102 @@ GType publishing_rajce_authentication_pane_get_type (void) {
 }
 
 
-static gpointer _publishing_rajce_album_ref0 (gpointer self) {
+static gpointer
+_publishing_rajce_album_ref0 (gpointer self)
+{
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? publishing_rajce_album_ref (self) : NULL;
-#line 7087 "RajcePublishing.c"
+#line 7354 "RajcePublishing.c"
 }
 
 
-static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int length) {
+static PublishingRajceAlbum**
+_vala_array_dup5 (PublishingRajceAlbum** self,
+                  int length)
+{
 	PublishingRajceAlbum** result;
 	int i;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = g_new0 (PublishingRajceAlbum*, length + 1);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7098 "RajcePublishing.c"
+#line 7368 "RajcePublishing.c"
 		PublishingRajceAlbum* _tmp0_;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _publishing_rajce_album_ref0 (self[i]);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result[i] = _tmp0_;
-#line 7104 "RajcePublishing.c"
+#line 7374 "RajcePublishing.c"
 	}
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 7108 "RajcePublishing.c"
+#line 7378 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                            gpointer self)
+{
 #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7115 "RajcePublishing.c"
+#line 7388 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                          gpointer self)
+{
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_create_new_radio_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7122 "RajcePublishing.c"
+#line 7398 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                           gpointer self)
+{
 #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_new_album_entry_changed ((PublishingRajcePublishingOptionsPane*) self);
-#line 7129 "RajcePublishing.c"
+#line 7408 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                gpointer self)
+{
 #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_logout_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7136 "RajcePublishing.c"
+#line 7418 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                 gpointer self)
+{
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_publish_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7143 "RajcePublishing.c"
+#line 7428 "RajcePublishing.c"
 }
 
 
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) {
+PublishingRajcePublishingOptionsPane*
+publishing_rajce_publishing_options_pane_construct (GType object_type,
+                                                    PublishingRajceRajcePublisher* publisher,
+                                                    const gchar* username,
+                                                    PublishingRajceAlbum** albums,
+                                                    int albums_length1)
+{
 	PublishingRajcePublishingOptionsPane * self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	PublishingRajceAlbum** _tmp2_;
-	gint _tmp2__length1;
-	PublishingRajceAlbum** _tmp3_;
-	gint _tmp3__length1;
-	PublishingRajceRajcePublisher* _tmp4_;
-	PublishingRajceRajcePublisher* _tmp5_;
-	GtkBox* _tmp6_;
+	gchar* _tmp0_;
+	PublishingRajceAlbum** _tmp1_;
+	gint _tmp1__length1;
+	PublishingRajceRajcePublisher* _tmp2_;
+	GtkBox* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (publisher), NULL);
@@ -7166,331 +7453,308 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingOptionsPane*) g_object_new (object_type, NULL);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = username;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (username);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->username);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->username = _tmp1_;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = albums;
+	self->priv->username = _tmp0_;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2__length1 = albums_length1;
+	_tmp1_ = (albums != NULL) ? _vala_array_dup5 (albums, albums_length1) : ((gpointer) albums);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup5 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3__length1 = _tmp2__length1;
+	_tmp1__length1 = albums_length1;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albums = _tmp3_;
+	self->priv->albums = _tmp1_;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albums_length1 = _tmp3__length1;
+	self->priv->albums_length1 = _tmp1__length1;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publisher;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp2_ = _g_object_ref0 (publisher);
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->publisher = _tmp5_;
+	self->priv->publisher = _tmp2_;
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp3_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp3_);
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->pane_widget = _tmp6_;
-#line 7205 "RajcePublishing.c"
+	self->priv->pane_widget = _tmp3_;
+#line 7484 "RajcePublishing.c"
 	{
+		GtkBuilder* _tmp4_;
+		GtkBuilder* _tmp5_;
+		GtkBuilder* _tmp6_;
 		GtkBuilder* _tmp7_;
-		GtkBuilder* _tmp8_;
-		GtkBuilder* _tmp9_;
+		GObject* _tmp8_;
+		GtkBox* _tmp9_;
 		GtkBuilder* _tmp10_;
 		GObject* _tmp11_;
-		GtkBox* _tmp12_;
+		GtkLabel* _tmp12_;
 		GtkBuilder* _tmp13_;
 		GObject* _tmp14_;
 		GtkLabel* _tmp15_;
 		GtkBuilder* _tmp16_;
 		GObject* _tmp17_;
-		GtkLabel* _tmp18_;
+		GtkRadioButton* _tmp18_;
 		GtkBuilder* _tmp19_;
 		GObject* _tmp20_;
-		GtkRadioButton* _tmp21_;
+		GtkComboBoxText* _tmp21_;
 		GtkBuilder* _tmp22_;
 		GObject* _tmp23_;
-		GtkComboBoxText* _tmp24_;
+		GtkRadioButton* _tmp24_;
 		GtkBuilder* _tmp25_;
 		GObject* _tmp26_;
-		GtkRadioButton* _tmp27_;
+		GtkEntry* _tmp27_;
 		GtkBuilder* _tmp28_;
 		GObject* _tmp29_;
-		GtkEntry* _tmp30_;
-		GtkBuilder* _tmp31_;
-		GObject* _tmp32_;
-		GtkCheckButton* _tmp33_;
+		GtkCheckButton* _tmp30_;
+		GtkCheckButton* _tmp31_;
+		GtkBuilder* _tmp32_;
+		GObject* _tmp33_;
 		GtkCheckButton* _tmp34_;
 		GtkBuilder* _tmp35_;
 		GObject* _tmp36_;
-		GtkCheckButton* _tmp37_;
+		GtkButton* _tmp37_;
 		GtkBuilder* _tmp38_;
 		GObject* _tmp39_;
 		GtkButton* _tmp40_;
-		GtkBuilder* _tmp41_;
-		GObject* _tmp42_;
-		GtkButton* _tmp43_;
-		GtkCheckButton* _tmp44_;
-		PublishingRajceRajcePublisher* _tmp45_;
-		gboolean _tmp46_;
-		GtkCheckButton* _tmp47_;
-		PublishingRajceRajcePublisher* _tmp48_;
-		gboolean _tmp49_;
-		GtkLabel* _tmp50_;
-		const gchar* _tmp51_;
-		gchar* _tmp52_;
-		gchar* _tmp53_;
-		GtkLabel* _tmp54_;
-		GtkRadioButton* _tmp55_;
-		GtkRadioButton* _tmp56_;
-		GtkCheckButton* _tmp57_;
-		GtkButton* _tmp58_;
-		GtkButton* _tmp59_;
-		GtkRadioButton* _tmp60_;
-		GtkRadioButton* _tmp61_;
-		GtkEntry* _tmp62_;
-		GtkButton* _tmp63_;
-		GtkButton* _tmp64_;
+		GtkCheckButton* _tmp41_;
+		GtkCheckButton* _tmp42_;
+		GtkLabel* _tmp43_;
+		gchar* _tmp44_;
+		gchar* _tmp45_;
+		GtkLabel* _tmp46_;
+		GtkRadioButton* _tmp47_;
+		GtkRadioButton* _tmp48_;
+		GtkCheckButton* _tmp49_;
+		GtkButton* _tmp50_;
+		GtkButton* _tmp51_;
+		GtkRadioButton* _tmp52_;
+		GtkRadioButton* _tmp53_;
+		GtkEntry* _tmp54_;
+		GtkButton* _tmp55_;
+		GtkButton* _tmp56_;
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = gtk_builder_new ();
+		_tmp4_ = gtk_builder_new ();
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->builder);
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->builder = _tmp7_;
+		self->priv->builder = _tmp4_;
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = self->priv->builder;
+		_tmp5_ = self->priv->builder;
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_builder_add_from_resource (_tmp8_, PLUGIN_RESOURCE_PATH "/rajce_publishing_options_pane.ui", &_inner_error_);
+		gtk_builder_add_from_resource (_tmp5_, PLUGIN_RESOURCE_PATH "/rajce_publishing_options_pane.ui", &_inner_error_);
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7277 "RajcePublishing.c"
+#line 7551 "RajcePublishing.c"
 			goto __catch30_g_error;
 		}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = self->priv->builder;
+		_tmp6_ = self->priv->builder;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_builder_connect_signals (_tmp9_, NULL);
+		gtk_builder_connect_signals (_tmp6_, NULL);
 #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = self->priv->builder;
+		_tmp7_ = self->priv->builder;
 #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = gtk_builder_get_object (_tmp10_, "rajce_pane_widget");
+		_tmp8_ = gtk_builder_get_object (_tmp7_, "rajce_pane_widget");
 #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox));
+		_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_box_get_type (), GtkBox));
 #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->pane_widget);
 #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->pane_widget = _tmp12_;
+		self->priv->pane_widget = _tmp9_;
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = self->priv->builder;
+		_tmp10_ = self->priv->builder;
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = gtk_builder_get_object (_tmp13_, "login_identity_label");
+		_tmp11_ = gtk_builder_get_object (_tmp10_, "login_identity_label");
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
+		_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_label_get_type (), GtkLabel));
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->login_identity_label);
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->login_identity_label = _tmp15_;
+		self->priv->login_identity_label = _tmp12_;
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = self->priv->builder;
+		_tmp13_ = self->priv->builder;
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = gtk_builder_get_object (_tmp16_, "publish_to_label");
+		_tmp14_ = gtk_builder_get_object (_tmp13_, "publish_to_label");
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
+		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->publish_to_label);
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->publish_to_label = _tmp18_;
+		self->priv->publish_to_label = _tmp15_;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = self->priv->builder;
+		_tmp16_ = self->priv->builder;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = gtk_builder_get_object (_tmp19_, "use_existing_radio");
+		_tmp17_ = gtk_builder_get_object (_tmp16_, "use_existing_radio");
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_radio_button_get_type (), GtkRadioButton));
+		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_radio_button_get_type (), GtkRadioButton));
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->use_existing_radio);
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->use_existing_radio = _tmp21_;
+		self->priv->use_existing_radio = _tmp18_;
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = self->priv->builder;
+		_tmp19_ = self->priv->builder;
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp23_ = gtk_builder_get_object (_tmp22_, "existing_albums_combo");
+		_tmp20_ = gtk_builder_get_object (_tmp19_, "existing_albums_combo");
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_combo_box_text_get_type (), GtkComboBoxText));
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->existing_albums_combo);
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->existing_albums_combo = _tmp24_;
+		self->priv->existing_albums_combo = _tmp21_;
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp25_ = self->priv->builder;
+		_tmp22_ = self->priv->builder;
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = gtk_builder_get_object (_tmp25_, "create_new_radio");
+		_tmp23_ = gtk_builder_get_object (_tmp22_, "create_new_radio");
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_radio_button_get_type (), GtkRadioButton));
+		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_radio_button_get_type (), GtkRadioButton));
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->create_new_radio);
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->create_new_radio = _tmp27_;
+		self->priv->create_new_radio = _tmp24_;
 #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_ = self->priv->builder;
+		_tmp25_ = self->priv->builder;
 #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp29_ = gtk_builder_get_object (_tmp28_, "new_album_entry");
+		_tmp26_ = gtk_builder_get_object (_tmp25_, "new_album_entry");
 #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_entry_get_type (), GtkEntry));
+		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_entry_get_type (), GtkEntry));
 #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->new_album_entry);
 #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->new_album_entry = _tmp30_;
+		self->priv->new_album_entry = _tmp27_;
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp31_ = self->priv->builder;
+		_tmp28_ = self->priv->builder;
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp32_ = gtk_builder_get_object (_tmp31_, "hide_check");
+		_tmp29_ = gtk_builder_get_object (_tmp28_, "hide_check");
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton));
+		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_check_button_get_type (), GtkCheckButton));
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->hide_check);
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->hide_check = _tmp33_;
+		self->priv->hide_check = _tmp30_;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp34_ = self->priv->hide_check;
+		_tmp31_ = self->priv->hide_check;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _ ("_Hide album"));
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_button_get_type (), GtkButton), _ ("_Hide album"));
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp35_ = self->priv->builder;
+		_tmp32_ = self->priv->builder;
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp36_ = gtk_builder_get_object (_tmp35_, "show_check");
+		_tmp33_ = gtk_builder_get_object (_tmp32_, "show_check");
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_check_button_get_type (), GtkCheckButton));
+		_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_check_button_get_type (), GtkCheckButton));
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->show_check);
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->show_check = _tmp37_;
+		self->priv->show_check = _tmp34_;
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp38_ = self->priv->builder;
+		_tmp35_ = self->priv->builder;
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp39_ = gtk_builder_get_object (_tmp38_, "publish_button");
+		_tmp36_ = gtk_builder_get_object (_tmp35_, "publish_button");
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_button_get_type (), GtkButton));
+		_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->publish_button);
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->publish_button = _tmp40_;
+		self->priv->publish_button = _tmp37_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp41_ = self->priv->builder;
+		_tmp38_ = self->priv->builder;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp42_ = gtk_builder_get_object (_tmp41_, "logout_button");
+		_tmp39_ = gtk_builder_get_object (_tmp38_, "logout_button");
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_button_get_type (), GtkButton));
+		_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_button_get_type (), GtkButton));
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->logout_button);
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->logout_button = _tmp43_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp44_ = self->priv->hide_check;
+		self->priv->logout_button = _tmp40_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp45_ = publisher;
+		_tmp41_ = self->priv->hide_check;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp46_ = publishing_rajce_rajce_publisher_get_hide_album (_tmp45_);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp46_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp47_ = self->priv->show_check;
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_rajce_rajce_publisher_get_hide_album (publisher));
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp48_ = publisher;
+		_tmp42_ = self->priv->show_check;
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp49_ = publishing_rajce_rajce_publisher_get_show_album (_tmp48_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp50_ = self->priv->login_identity_label;
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_rajce_rajce_publisher_get_show_album (publisher));
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp51_ = username;
+		_tmp43_ = self->priv->login_identity_label;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp52_ = g_strdup_printf (_ ("You are logged into Rajce as %s."), _tmp51_);
+		_tmp44_ = g_strdup_printf (_ ("You are logged into Rajce as %s."), username);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp53_ = _tmp52_;
+		_tmp45_ = _tmp44_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp50_, _tmp53_);
+		gtk_label_set_label (_tmp43_, _tmp45_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp53_);
+		_g_free0 (_tmp45_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp54_ = self->priv->publish_to_label;
+		_tmp46_ = self->priv->publish_to_label;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp54_, _ ("Photos will appear in:"));
+		gtk_label_set_label (_tmp46_, _ ("Photos will appear in:"));
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp55_ = self->priv->use_existing_radio;
+		_tmp47_ = self->priv->use_existing_radio;
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_button_get_type (), GtkButton), _ ("An _existing album:"));
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_button_get_type (), GtkButton), _ ("An _existing album:"));
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp56_ = self->priv->create_new_radio;
+		_tmp48_ = self->priv->create_new_radio;
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), _ ("A _new album named:"));
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_button_get_type (), GtkButton), _ ("A _new album named:"));
 #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp57_ = self->priv->show_check;
+		_tmp49_ = self->priv->show_check;
 #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), _ ("Open target _album in browser"));
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_button_get_type (), GtkButton), _ ("Open target _album in browser"));
 #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp58_ = self->priv->publish_button;
+		_tmp50_ = self->priv->publish_button;
 #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (_tmp58_, _ ("_Publish"));
+		gtk_button_set_label (_tmp50_, _ ("_Publish"));
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp59_ = self->priv->logout_button;
+		_tmp51_ = self->priv->logout_button;
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (_tmp59_, _ ("_Logout"));
+		gtk_button_set_label (_tmp51_, _ ("_Logout"));
 #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp60_ = self->priv->use_existing_radio;
+		_tmp52_ = self->priv->use_existing_radio;
 #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp61_ = self->priv->create_new_radio;
+		_tmp53_ = self->priv->create_new_radio;
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
 #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp62_ = self->priv->new_album_entry;
+		_tmp54_ = self->priv->new_album_entry;
 #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
 #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp63_ = self->priv->logout_button;
+		_tmp55_ = self->priv->logout_button;
 #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp64_ = self->priv->publish_button;
+		_tmp56_ = self->priv->publish_button;
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (_tmp64_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 7470 "RajcePublishing.c"
+		g_signal_connect_object (_tmp56_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 7734 "RajcePublishing.c"
 	}
 	goto __finally30;
 	__catch30_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp65_;
-		const gchar* _tmp66_;
+		GError* _tmp57_;
+		const gchar* _tmp58_;
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		e = _inner_error_;
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_inner_error_ = NULL;
 #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp65_ = e;
+		_tmp57_ = e;
 #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp66_ = _tmp65_->message;
+		_tmp58_ = _tmp57_->message;
 #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp66_);
+		g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp58_);
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (e);
-#line 7490 "RajcePublishing.c"
+#line 7754 "RajcePublishing.c"
 	}
 	__finally30:
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7501,168 +7765,162 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 		g_clear_error (&_inner_error_);
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return NULL;
-#line 7501 "RajcePublishing.c"
+#line 7765 "RajcePublishing.c"
 	}
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 7505 "RajcePublishing.c"
+#line 7769 "RajcePublishing.c"
 }
 
 
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) {
+PublishingRajcePublishingOptionsPane*
+publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher,
+                                              const gchar* username,
+                                              PublishingRajceAlbum** albums,
+                                              int albums_length1)
+{
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_options_pane_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, publisher, username, albums, albums_length1);
-#line 7512 "RajcePublishing.c"
+#line 7781 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self)
+{
 	gboolean show_album = FALSE;
 	GtkCheckButton* _tmp0_;
-	gboolean _tmp1_;
-	PublishingRajceRajcePublisher* _tmp2_;
-	gboolean _tmp3_;
-	GtkRadioButton* _tmp4_;
-	gboolean _tmp5_;
+	PublishingRajceRajcePublisher* _tmp1_;
+	gboolean _tmp2_;
+	GtkRadioButton* _tmp3_;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->show_check;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	show_album = _tmp1_;
+	show_album = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = self->priv->publisher;
+	_tmp1_ = self->priv->publisher;
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = show_album;
+	_tmp2_ = show_album;
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_set_show_album (_tmp2_, _tmp3_);
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = self->priv->create_new_radio;
+	publishing_rajce_rajce_publisher_set_show_album (_tmp1_, _tmp2_);
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp3_ = self->priv->create_new_radio;
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp5_) {
-#line 7544 "RajcePublishing.c"
+	if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 7809 "RajcePublishing.c"
 		gchar* album_name = NULL;
-		GtkEntry* _tmp6_;
-		const gchar* _tmp7_;
-		gchar* _tmp8_;
+		GtkEntry* _tmp4_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 		gboolean hide_album = FALSE;
-		GtkCheckButton* _tmp9_;
-		gboolean _tmp10_;
-		PublishingRajceRajcePublisher* _tmp11_;
-		gboolean _tmp12_;
-		const gchar* _tmp13_;
-		gboolean _tmp14_;
-		PublishingRajcePublishingParameters* _tmp15_;
-		PublishingRajcePublishingParameters* _tmp16_;
+		GtkCheckButton* _tmp7_;
+		PublishingRajceRajcePublisher* _tmp8_;
+		gboolean _tmp9_;
+		const gchar* _tmp10_;
+		gboolean _tmp11_;
+		PublishingRajcePublishingParameters* _tmp12_;
+		PublishingRajcePublishingParameters* _tmp13_;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp6_ = self->priv->new_album_entry;
+		_tmp4_ = self->priv->new_album_entry;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = gtk_entry_get_text (_tmp6_);
+		_tmp5_ = gtk_entry_get_text (_tmp4_);
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = g_strdup (_tmp7_);
+		_tmp6_ = g_strdup (_tmp5_);
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		album_name = _tmp8_;
+		album_name = _tmp6_;
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = self->priv->hide_check;
+		_tmp7_ = self->priv->hide_check;
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		hide_album = _tmp10_;
+		hide_album = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = self->priv->publisher;
+		_tmp8_ = self->priv->publisher;
 #line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = hide_album;
+		_tmp9_ = hide_album;
 #line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_rajce_publisher_set_hide_album (_tmp11_, _tmp12_);
+		publishing_rajce_rajce_publisher_set_hide_album (_tmp8_, _tmp9_);
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = album_name;
+		_tmp10_ = album_name;
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = hide_album;
+		_tmp11_ = hide_album;
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = publishing_rajce_publishing_parameters_new_to_new_album (_tmp13_, _tmp14_);
+		_tmp12_ = publishing_rajce_publishing_parameters_new_to_new_album (_tmp10_, _tmp11_);
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = _tmp15_;
+		_tmp13_ = _tmp12_;
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp16_);
+		g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp13_);
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_publishing_rajce_publishing_parameters_unref0 (_tmp16_);
+		_publishing_rajce_publishing_parameters_unref0 (_tmp13_);
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (album_name);
-#line 7592 "RajcePublishing.c"
+#line 7854 "RajcePublishing.c"
 	} else {
 		gint id = 0;
-		PublishingRajceAlbum** _tmp17_;
-		gint _tmp17__length1;
-		GtkComboBoxText* _tmp18_;
-		gint _tmp19_;
-		PublishingRajceAlbum* _tmp20_;
-		gint _tmp21_;
+		PublishingRajceAlbum** _tmp14_;
+		gint _tmp14__length1;
+		GtkComboBoxText* _tmp15_;
+		PublishingRajceAlbum* _tmp16_;
+		gint _tmp17_;
 		gchar* album_name = NULL;
-		PublishingRajceAlbum** _tmp22_;
-		gint _tmp22__length1;
-		GtkComboBoxText* _tmp23_;
+		PublishingRajceAlbum** _tmp18_;
+		gint _tmp18__length1;
+		GtkComboBoxText* _tmp19_;
+		PublishingRajceAlbum* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
+		const gchar* _tmp23_;
 		gint _tmp24_;
-		PublishingRajceAlbum* _tmp25_;
-		const gchar* _tmp26_;
-		gchar* _tmp27_;
-		const gchar* _tmp28_;
-		gint _tmp29_;
-		PublishingRajcePublishingParameters* _tmp30_;
-		PublishingRajcePublishingParameters* _tmp31_;
+		PublishingRajcePublishingParameters* _tmp25_;
+		PublishingRajcePublishingParameters* _tmp26_;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = self->priv->albums;
+		_tmp14_ = self->priv->albums;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17__length1 = self->priv->albums_length1;
+		_tmp14__length1 = self->priv->albums_length1;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = self->priv->existing_albums_combo;
+		_tmp15_ = self->priv->existing_albums_combo;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox));
+		_tmp16_ = _tmp14_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = _tmp17_[_tmp19_];
+		_tmp17_ = _tmp16_->id;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = _tmp20_->id;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		id = _tmp21_;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = self->priv->albums;
+		id = _tmp17_;
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22__length1 = self->priv->albums_length1;
+		_tmp18_ = self->priv->albums;
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp23_ = self->priv->existing_albums_combo;
+		_tmp18__length1 = self->priv->albums_length1;
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
+		_tmp19_ = self->priv->existing_albums_combo;
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp25_ = _tmp22_[_tmp24_];
+		_tmp20_ = _tmp18_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = _tmp25_->albumName;
+		_tmp21_ = _tmp20_->albumName;
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = g_strdup (_tmp26_);
+		_tmp22_ = g_strdup (_tmp21_);
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		album_name = _tmp27_;
+		album_name = _tmp22_;
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_ = album_name;
+		_tmp23_ = album_name;
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp29_ = id;
+		_tmp24_ = id;
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp30_ = publishing_rajce_publishing_parameters_new_to_existing_album (_tmp28_, _tmp29_);
+		_tmp25_ = publishing_rajce_publishing_parameters_new_to_existing_album (_tmp23_, _tmp24_);
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp31_ = _tmp30_;
+		_tmp26_ = _tmp25_;
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp31_);
+		g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp26_);
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_publishing_rajce_publishing_parameters_unref0 (_tmp31_);
+		_publishing_rajce_publishing_parameters_unref0 (_tmp26_);
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (album_name);
-#line 7657 "RajcePublishing.c"
+#line 7913 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self)
+{
 	GtkComboBoxText* _tmp0_;
 	GtkEntry* _tmp1_;
 	GtkComboBoxText* _tmp2_;
@@ -7687,11 +7945,13 @@ static void publishing_rajce_publishing_options_pane_on_use_existing_radio_click
 	_tmp3_ = self->priv->hide_check;
 #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7687 "RajcePublishing.c"
+#line 7945 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self)
+{
 	GtkEntry* _tmp0_;
 	GtkComboBoxText* _tmp1_;
 	GtkEntry* _tmp2_;
@@ -7716,43 +7976,49 @@ static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked
 	_tmp3_ = self->priv->hide_check;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7716 "RajcePublishing.c"
+#line 7976 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self)
+{
 #line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 7725 "RajcePublishing.c"
+#line 7987 "RajcePublishing.c"
 }
 
 
-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 7748 "RajcePublishing.c"
+#line 8012 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self)
+{
 	gchar* album_name = NULL;
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
@@ -7762,7 +8028,7 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi
 	gchar* _tmp5_;
 	gchar* _tmp6_;
 	gboolean _tmp7_;
-	GtkButton* _tmp10_;
+	GtkButton* _tmp9_;
 #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7787,56 +8053,57 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi
 	if (_tmp7_) {
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = TRUE;
-#line 7787 "RajcePublishing.c"
+#line 8053 "RajcePublishing.c"
 	} else {
 		GtkRadioButton* _tmp8_;
-		gboolean _tmp9_;
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp8_ = self->priv->create_new_radio;
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3_ = !_tmp9_;
-#line 7797 "RajcePublishing.c"
+		_tmp3_ = !gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 8060 "RajcePublishing.c"
 	}
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = self->priv->publish_button;
+	_tmp9_ = self->priv->publish_button;
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp3_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp3_);
 #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (album_name);
-#line 7805 "RajcePublishing.c"
+#line 8068 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self)
+{
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 7814 "RajcePublishing.c"
+#line 8079 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self) {
+void
+publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self)
+{
 	PublishingRajceAlbum** _tmp9_;
 	gint _tmp9__length1;
 	GtkRadioButton* _tmp15_;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 7824 "RajcePublishing.c"
+#line 8091 "RajcePublishing.c"
 	{
 		gint i = 0;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		i = 0;
-#line 7829 "RajcePublishing.c"
+#line 8096 "RajcePublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp0_ = TRUE;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			while (TRUE) {
-#line 7836 "RajcePublishing.c"
+#line 8103 "RajcePublishing.c"
 				gint _tmp2_;
 				PublishingRajceAlbum** _tmp3_;
 				gint _tmp3__length1;
@@ -7848,13 +8115,13 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 				const gchar* _tmp8_;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				if (!_tmp0_) {
-#line 7848 "RajcePublishing.c"
+#line 8115 "RajcePublishing.c"
 					gint _tmp1_;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp1_ = i;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					i = _tmp1_ + 1;
-#line 7854 "RajcePublishing.c"
+#line 8121 "RajcePublishing.c"
 				}
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp0_ = FALSE;
@@ -7868,7 +8135,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 				if (!(_tmp2_ < _tmp3__length1)) {
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					break;
-#line 7868 "RajcePublishing.c"
+#line 8135 "RajcePublishing.c"
 				}
 #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp4_ = self->priv->existing_albums_combo;
@@ -7884,7 +8151,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 				_tmp8_ = _tmp7_->albumName;
 #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				gtk_combo_box_text_append_text (_tmp4_, _tmp8_);
-#line 7884 "RajcePublishing.c"
+#line 8151 "RajcePublishing.c"
 			}
 		}
 	}
@@ -7894,7 +8161,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 	_tmp9__length1 = self->priv->albums_length1;
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp9__length1 == 0) {
-#line 7894 "RajcePublishing.c"
+#line 8161 "RajcePublishing.c"
 		GtkComboBoxText* _tmp10_;
 		GtkRadioButton* _tmp11_;
 #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7905,7 +8172,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 		_tmp11_ = self->priv->use_existing_radio;
 #line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7905 "RajcePublishing.c"
+#line 8172 "RajcePublishing.c"
 	} else {
 		GtkComboBoxText* _tmp12_;
 		GtkComboBoxText* _tmp13_;
@@ -7922,7 +8189,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 		_tmp14_ = self->priv->use_existing_radio;
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7922 "RajcePublishing.c"
+#line 8189 "RajcePublishing.c"
 	}
 #line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp15_ = self->priv->create_new_radio;
@@ -7930,34 +8197,38 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (self);
-#line 7930 "RajcePublishing.c"
+#line 8197 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters) {
-	PublishingRajcePublishingParameters* _tmp0_;
+void
+publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self,
+                                                         PublishingRajcePublishingParameters* parameters)
+{
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters));
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = parameters;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_);
-#line 7944 "RajcePublishing.c"
+	g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, parameters);
+#line 8211 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self) {
+void
+publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self)
+{
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 7953 "RajcePublishing.c"
+#line 8222 "RajcePublishing.c"
 }
 
 
-GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self) {
+GtkWidget*
+publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self)
+{
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_;
 	GtkWidget* _tmp1_;
@@ -7971,11 +8242,13 @@ GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (Publishi
 	result = _tmp1_;
 #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 7971 "RajcePublishing.c"
+#line 8242 "RajcePublishing.c"
 }
 
 
-static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingRajcePublishingOptionsPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -7990,11 +8263,13 @@ static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (Spit
 	result = _tmp1_;
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 7990 "RajcePublishing.c"
+#line 8263 "RajcePublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingRajcePublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8003,25 +8278,34 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_optio
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8003 "RajcePublishing.c"
+#line 8278 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                           PublishingRajcePublishingParameters* parameters,
+                                                                                                           gpointer self)
+{
 #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_notify_publish ((PublishingRajcePublishingOptionsPane*) self, parameters);
-#line 8010 "RajcePublishing.c"
+#line 8289 "RajcePublishing.c"
 }
 
 
-static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+                                                                                                         gpointer self)
+{
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_notify_logout ((PublishingRajcePublishingOptionsPane*) self);
-#line 8017 "RajcePublishing.c"
+#line 8299 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingRajcePublishingOptionsPane * self;
 #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
@@ -8031,11 +8315,13 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_installed (Spi
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self, 0);
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self, 0);
-#line 8031 "RajcePublishing.c"
+#line 8315 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingRajcePublishingOptionsPane * self;
 	guint _tmp0_;
 	guint _tmp1_;
@@ -8049,11 +8335,18 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (S
 	g_signal_parse_name ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self);
-#line 8049 "RajcePublishing.c"
+#line 8335 "RajcePublishing.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS (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_RAJCE_PUBLISHING_PARAMETERS (GClosure * closure,
+                                                                      GValue * return_value,
+                                                                      guint n_param_values,
+                                                                      const GValue * param_values,
+                                                                      gpointer invocation_hint,
+                                                                      gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS) (gpointer data1, gpointer arg_1, gpointer data2);
 	register GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS callback;
 	register GCClosure * cc;
@@ -8068,23 +8361,25 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS
 		data1 = closure->data;
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8068 "RajcePublishing.c"
+#line 8361 "RajcePublishing.c"
 	} else {
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = closure->data;
-#line 8074 "RajcePublishing.c"
+#line 8367 "RajcePublishing.c"
 	}
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback = (GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback);
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback (data1, publishing_rajce_value_get_publishing_parameters (param_values + 1), data2);
-#line 8080 "RajcePublishing.c"
+#line 8373 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_class_init (PublishingRajcePublishingOptionsPaneClass * klass) {
+static void
+publishing_rajce_publishing_options_pane_class_init (PublishingRajcePublishingOptionsPaneClass * klass)
+{
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8095,11 +8390,13 @@ static void publishing_rajce_publishing_options_pane_class_init (PublishingRajce
 	publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS);
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8095 "RajcePublishing.c"
+#line 8390 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8110,11 +8407,13 @@ static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_on_pane_installed;
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_on_pane_uninstalled;
-#line 8110 "RajcePublishing.c"
+#line 8407 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_instance_init (PublishingRajcePublishingOptionsPane * self) {
+static void
+publishing_rajce_publishing_options_pane_instance_init (PublishingRajcePublishingOptionsPane * self)
+{
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8141,11 +8440,13 @@ static void publishing_rajce_publishing_options_pane_instance_init (PublishingRa
 	self->priv->publish_button = NULL;
 #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->logout_button = NULL;
-#line 8141 "RajcePublishing.c"
+#line 8440 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_rajce_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingRajcePublishingOptionsPane * self;
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
@@ -8181,11 +8482,13 @@ static void publishing_rajce_publishing_options_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->logout_button);
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (publishing_rajce_publishing_options_pane_parent_class)->finalize (obj);
-#line 8181 "RajcePublishing.c"
+#line 8482 "RajcePublishing.c"
 }
 
 
-GType publishing_rajce_publishing_options_pane_get_type (void) {
+GType
+publishing_rajce_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_rajce_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajcePublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajcePublishingOptionsPane), 0, (GInstanceInitFunc) publishing_rajce_publishing_options_pane_instance_init, NULL };
@@ -8199,213 +8502,244 @@ GType publishing_rajce_publishing_options_pane_get_type (void) {
 }
 
 
-static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct (GType object_type) {
+static PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_construct (GType object_type)
+{
 	PublishingRajcePublishingParameters* self = NULL;
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8205 "RajcePublishing.c"
+#line 8510 "RajcePublishing.c"
 }
 
 
-static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void) {
+static PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_new (void)
+{
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_parameters_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS);
-#line 8212 "RajcePublishing.c"
+#line 8519 "RajcePublishing.c"
 }
 
 
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_name, gboolean album_hidden) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type,
+                                                               const gchar* album_name,
+                                                               gboolean album_hidden)
+{
 	PublishingRajcePublishingParameters* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gboolean _tmp2_;
-	gboolean* _tmp3_;
-	gint _tmp4_;
-	gint* _tmp5_;
+	gchar* _tmp0_;
+	gboolean* _tmp1_;
+	gint _tmp2_;
+	gint* _tmp3_;
 #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
 #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
 #line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = album_name;
-#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (album_name);
 #line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_name);
 #line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_name = _tmp1_;
+	self->album_name = _tmp0_;
 #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = album_hidden;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = __bool_dup0 (&_tmp2_);
+	_tmp1_ = __bool_dup0 (&album_hidden);
 #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_hidden);
 #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_hidden = _tmp3_;
+	self->album_hidden = _tmp1_;
 #line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = 0;
+	_tmp2_ = 0;
 #line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = __int_dup0 (&_tmp4_);
+	_tmp3_ = __int_dup0 (&_tmp2_);
 #line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_id);
 #line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_id = _tmp5_;
+	self->album_id = _tmp3_;
 #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8254 "RajcePublishing.c"
+#line 8559 "RajcePublishing.c"
 }
 
 
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name, gboolean album_hidden) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name,
+                                                         gboolean album_hidden)
+{
 #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_parameters_construct_to_new_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_hidden);
-#line 8261 "RajcePublishing.c"
+#line 8569 "RajcePublishing.c"
 }
 
 
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_name, gint album_id) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type,
+                                                                    const gchar* album_name,
+                                                                    gint album_id)
+{
 	PublishingRajcePublishingParameters* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint _tmp2_;
-	gint* _tmp3_;
+	gchar* _tmp0_;
+	gint* _tmp1_;
 #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
 #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
 #line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = album_name;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (album_name);
 #line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_name);
 #line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_name = _tmp1_;
+	self->album_name = _tmp0_;
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_hidden);
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->album_hidden = NULL;
 #line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = album_id;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = __int_dup0 (&_tmp2_);
+	_tmp1_ = __int_dup0 (&album_id);
 #line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_id);
 #line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_id = _tmp3_;
+	self->album_id = _tmp1_;
 #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8297 "RajcePublishing.c"
+#line 8603 "RajcePublishing.c"
 }
 
 
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name, gint album_id) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name,
+                                                              gint album_id)
+{
 #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_parameters_construct_to_existing_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_id);
-#line 8304 "RajcePublishing.c"
+#line 8613 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_rajce_value_publishing_parameters_init (GValue* value)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8311 "RajcePublishing.c"
+#line 8622 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_rajce_value_publishing_parameters_free_value (GValue* value)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_unref (value->data[0].v_pointer);
-#line 8320 "RajcePublishing.c"
+#line 8633 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_publishing_parameters_copy_value (const GValue* src_value,
+                                                         GValue* dest_value)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 8330 "RajcePublishing.c"
+#line 8646 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8334 "RajcePublishing.c"
+#line 8650 "RajcePublishing.c"
 	}
 }
 
 
-static gpointer publishing_rajce_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_publishing_parameters_peek_pointer (const GValue* value)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 8342 "RajcePublishing.c"
+#line 8660 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_publishing_parameters_collect_value (GValue* value,
+                                                            guint n_collect_values,
+                                                            GTypeCValue* collect_values,
+                                                            guint collect_flags)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8349 "RajcePublishing.c"
+#line 8672 "RajcePublishing.c"
 		PublishingRajcePublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8356 "RajcePublishing.c"
+#line 8679 "RajcePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 8360 "RajcePublishing.c"
+#line 8683 "RajcePublishing.c"
 		}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (object);
-#line 8364 "RajcePublishing.c"
+#line 8687 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8368 "RajcePublishing.c"
+#line 8691 "RajcePublishing.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 8372 "RajcePublishing.c"
+#line 8695 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_publishing_parameters_lcopy_value (const GValue* value,
+                                                          guint n_collect_values,
+                                                          GTypeCValue* collect_values,
+                                                          guint collect_flags)
+{
 	PublishingRajcePublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!object_p) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8383 "RajcePublishing.c"
+#line 8711 "RajcePublishing.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = NULL;
-#line 8389 "RajcePublishing.c"
+#line 8717 "RajcePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8393 "RajcePublishing.c"
+#line 8721 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer);
-#line 8397 "RajcePublishing.c"
+#line 8725 "RajcePublishing.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 8401 "RajcePublishing.c"
+#line 8729 "RajcePublishing.c"
 }
 
 
-GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_publishing_parameters (const gchar* name,
+                                                   const gchar* nick,
+                                                   const gchar* blurb,
+                                                   GType object_type,
+                                                   GParamFlags flags)
+{
 	PublishingRajceParamSpecPublishingParameters* spec;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -8415,20 +8749,25 @@ GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8415 "RajcePublishing.c"
+#line 8749 "RajcePublishing.c"
 }
 
 
-gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_rajce_value_get_publishing_parameters (const GValue* value)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 8424 "RajcePublishing.c"
+#line 8760 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_publishing_parameters (GValue* value,
+                                                  gpointer v_object)
+{
 	PublishingRajcePublishingParameters * old;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
@@ -8444,22 +8783,25 @@ void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v
 		value->data[0].v_pointer = v_object;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer);
-#line 8444 "RajcePublishing.c"
+#line 8783 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8448 "RajcePublishing.c"
+#line 8787 "RajcePublishing.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_unref (old);
-#line 8454 "RajcePublishing.c"
+#line 8793 "RajcePublishing.c"
 	}
 }
 
 
-void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_publishing_parameters (GValue* value,
+                                                   gpointer v_object)
+{
 	PublishingRajcePublishingParameters * old;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
@@ -8473,38 +8815,44 @@ void publishing_rajce_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 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8473 "RajcePublishing.c"
+#line 8815 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8477 "RajcePublishing.c"
+#line 8819 "RajcePublishing.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_unref (old);
-#line 8483 "RajcePublishing.c"
+#line 8825 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_publishing_parameters_class_init (PublishingRajcePublishingParametersClass * klass) {
+static void
+publishing_rajce_publishing_parameters_class_init (PublishingRajcePublishingParametersClass * klass)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRajcePublishingParametersClass *) klass)->finalize = publishing_rajce_publishing_parameters_finalize;
-#line 8493 "RajcePublishing.c"
+#line 8837 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_parameters_instance_init (PublishingRajcePublishingParameters * self) {
+static void
+publishing_rajce_publishing_parameters_instance_init (PublishingRajcePublishingParameters * self)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->ref_count = 1;
-#line 8500 "RajcePublishing.c"
+#line 8846 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj) {
+static void
+publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj)
+{
 	PublishingRajcePublishingParameters * self;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, PublishingRajcePublishingParameters);
@@ -8516,11 +8864,13 @@ static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePubl
 	_g_free0 (self->album_hidden);
 #line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_id);
-#line 8516 "RajcePublishing.c"
+#line 8864 "RajcePublishing.c"
 }
 
 
-GType publishing_rajce_publishing_parameters_get_type (void) {
+GType
+publishing_rajce_publishing_parameters_get_type (void)
+{
 	static volatile gsize publishing_rajce_publishing_parameters_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_publishing_parameters_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_publishing_parameters_init, publishing_rajce_value_publishing_parameters_free_value, publishing_rajce_value_publishing_parameters_copy_value, publishing_rajce_value_publishing_parameters_peek_pointer, "p", publishing_rajce_value_publishing_parameters_collect_value, "p", publishing_rajce_value_publishing_parameters_lcopy_value };
@@ -8534,18 +8884,22 @@ GType publishing_rajce_publishing_parameters_get_type (void) {
 }
 
 
-gpointer publishing_rajce_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_rajce_publishing_parameters_ref (gpointer instance)
+{
 	PublishingRajcePublishingParameters * self;
 	self = instance;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return instance;
-#line 8541 "RajcePublishing.c"
+#line 8893 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_publishing_parameters_unref (gpointer instance) {
+void
+publishing_rajce_publishing_parameters_unref (gpointer instance)
+{
 	PublishingRajcePublishingParameters * self;
 	self = instance;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8554,29 +8908,35 @@ void publishing_rajce_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8554 "RajcePublishing.c"
+#line 8908 "RajcePublishing.c"
 	}
 }
 
 
-PublishingRajceSession* publishing_rajce_session_construct (GType object_type) {
+PublishingRajceSession*
+publishing_rajce_session_construct (GType object_type)
+{
 	PublishingRajceSession* self = NULL;
 #line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajceSession*) publishing_rest_support_session_construct (object_type, "");
 #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8565 "RajcePublishing.c"
+#line 8921 "RajcePublishing.c"
 }
 
 
-PublishingRajceSession* publishing_rajce_session_new (void) {
+PublishingRajceSession*
+publishing_rajce_session_new (void)
+{
 #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_session_construct (PUBLISHING_RAJCE_TYPE_SESSION);
-#line 8572 "RajcePublishing.c"
+#line 8930 "RajcePublishing.c"
 }
 
 
-static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_rajce_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
 	PublishingRajceSession * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
@@ -8588,51 +8948,53 @@ static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSu
 	_tmp2_ = self->priv->userid;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 8588 "RajcePublishing.c"
+#line 8948 "RajcePublishing.c"
 		const gchar* _tmp3_;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = self->priv->usertoken;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 8594 "RajcePublishing.c"
+#line 8954 "RajcePublishing.c"
 	} else {
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp1_ = FALSE;
-#line 8598 "RajcePublishing.c"
+#line 8958 "RajcePublishing.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1_) {
-#line 8602 "RajcePublishing.c"
+#line 8962 "RajcePublishing.c"
 		const gchar* _tmp4_;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = self->priv->username;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 8608 "RajcePublishing.c"
+#line 8968 "RajcePublishing.c"
 	} else {
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 8612 "RajcePublishing.c"
+#line 8972 "RajcePublishing.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp0_;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8618 "RajcePublishing.c"
+#line 8978 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_session_authenticate (PublishingRajceSession* self, const gchar* token, const gchar* name, gint id, gint maxsize, gint quality) {
-	const gchar* _tmp0_;
+void
+publishing_rajce_session_authenticate (PublishingRajceSession* self,
+                                       const gchar* token,
+                                       const gchar* name,
+                                       gint id,
+                                       gint maxsize,
+                                       gint quality)
+{
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gint _tmp4_;
-	gint* _tmp5_;
-	gint _tmp6_;
-	gint* _tmp7_;
-	gint _tmp8_;
-	gint* _tmp9_;
+	gint* _tmp2_;
+	gint* _tmp3_;
+	gint* _tmp4_;
 #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
 #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8640,50 +9002,42 @@ void publishing_rajce_session_authenticate (PublishingRajceSession* self, const
 #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
 #line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = token;
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (token);
 #line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->usertoken);
 #line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->usertoken = _tmp1_;
+	self->priv->usertoken = _tmp0_;
 #line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = name;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (name);
 #line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->username);
 #line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->username = _tmp3_;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = id;
+	self->priv->username = _tmp1_;
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = __int_dup0 (&_tmp4_);
+	_tmp2_ = __int_dup0 (&id);
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->userid);
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->userid = _tmp5_;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = maxsize;
+	self->priv->userid = _tmp2_;
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = __int_dup0 (&_tmp6_);
+	_tmp3_ = __int_dup0 (&maxsize);
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->maxsize);
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->maxsize = _tmp7_;
+	self->priv->maxsize = _tmp3_;
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = quality;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = __int_dup0 (&_tmp8_);
+	_tmp4_ = __int_dup0 (&quality);
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->quality);
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->quality = _tmp9_;
-#line 8679 "RajcePublishing.c"
+	self->priv->quality = _tmp4_;
+#line 9031 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_session_deauthenticate (PublishingRajceSession* self) {
+void
+publishing_rajce_session_deauthenticate (PublishingRajceSession* self)
+{
 #line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
 #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8714,62 +9068,64 @@ void publishing_rajce_session_deauthenticate (PublishingRajceSession* self) {
 	_g_free0 (self->priv->quality);
 #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->quality = NULL;
-#line 8714 "RajcePublishing.c"
+#line 9068 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_rajce_session_set_usertoken (PublishingRajceSession* self,
+                                        const gchar* usertoken)
+{
+	gchar* _tmp0_;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = usertoken;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (usertoken);
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->usertoken);
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->usertoken = _tmp1_;
-#line 8731 "RajcePublishing.c"
+	self->priv->usertoken = _tmp0_;
+#line 9085 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_rajce_session_set_albumtoken (PublishingRajceSession* self,
+                                         const gchar* albumtoken)
+{
+	gchar* _tmp0_;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = albumtoken;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (albumtoken);
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->albumtoken);
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albumtoken = _tmp1_;
-#line 8748 "RajcePublishing.c"
+	self->priv->albumtoken = _tmp0_;
+#line 9102 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_rajce_session_set_albumticket (PublishingRajceSession* self,
+                                          const gchar* albumticket)
+{
+	gchar* _tmp0_;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = albumticket;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (albumticket);
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->albumticket);
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albumticket = _tmp1_;
-#line 8765 "RajcePublishing.c"
+	self->priv->albumticket = _tmp0_;
+#line 9119 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_usertoken (PublishingRajceSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -8783,11 +9139,13 @@ gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) {
 	result = _tmp1_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8783 "RajcePublishing.c"
+#line 9139 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_albumtoken (PublishingRajceSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -8801,11 +9159,13 @@ gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) {
 	result = _tmp1_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8801 "RajcePublishing.c"
+#line 9159 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_albumticket (PublishingRajceSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -8819,11 +9179,13 @@ gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) {
 	result = _tmp1_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8819 "RajcePublishing.c"
+#line 9179 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_username (PublishingRajceSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -8837,11 +9199,13 @@ gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) {
 	result = _tmp1_;
 #line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8837 "RajcePublishing.c"
+#line 9199 "RajcePublishing.c"
 }
 
 
-gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) {
+gint
+publishing_rajce_session_get_maxsize (PublishingRajceSession* self)
+{
 	gint result = 0;
 	gint* _tmp0_;
 #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8852,11 +9216,13 @@ gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) {
 	result = *_tmp0_;
 #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8852 "RajcePublishing.c"
+#line 9216 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_session_class_init (PublishingRajceSessionClass * klass) {
+static void
+publishing_rajce_session_class_init (PublishingRajceSessionClass * klass)
+{
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_session_parent_class = g_type_class_peek_parent (klass);
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8865,11 +9231,13 @@ static void publishing_rajce_session_class_init (PublishingRajceSessionClass * k
 	g_type_class_add_private (klass, sizeof (PublishingRajceSessionPrivate));
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rajce_session_real_is_authenticated;
-#line 8865 "RajcePublishing.c"
+#line 9231 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_session_instance_init (PublishingRajceSession * self) {
+static void
+publishing_rajce_session_instance_init (PublishingRajceSession * self)
+{
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_SESSION_GET_PRIVATE (self);
 #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8886,11 +9254,13 @@ static void publishing_rajce_session_instance_init (PublishingRajceSession * sel
 	self->priv->maxsize = NULL;
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->quality = NULL;
-#line 8886 "RajcePublishing.c"
+#line 9254 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_rajce_session_finalize (PublishingRESTSupportSession * obj)
+{
 	PublishingRajceSession * self;
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession);
@@ -8910,14 +9280,16 @@ static void publishing_rajce_session_finalize (PublishingRESTSupportSession * ob
 	_g_free0 (self->priv->quality);
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rajce_session_parent_class)->finalize (obj);
-#line 8910 "RajcePublishing.c"
+#line 9280 "RajcePublishing.c"
 }
 
 
 /**
  * Session class that keeps track of the credentials
  */
-GType publishing_rajce_session_get_type (void) {
+GType
+publishing_rajce_session_get_type (void)
+{
 	static volatile gsize publishing_rajce_session_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_session_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceSession), 0, (GInstanceInitFunc) publishing_rajce_session_instance_init, NULL };
@@ -8929,83 +9301,93 @@ GType publishing_rajce_session_get_type (void) {
 }
 
 
-static gpointer _publishing_rajce_arg_item_ref0 (gpointer self) {
+static gpointer
+_publishing_rajce_arg_item_ref0 (gpointer self)
+{
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? publishing_rajce_arg_item_ref (self) : NULL;
-#line 8932 "RajcePublishing.c"
+#line 9306 "RajcePublishing.c"
 }
 
 
-PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* k, const gchar* v) {
+PublishingRajceArgItem*
+publishing_rajce_arg_item_construct (GType object_type,
+                                     const gchar* k,
+                                     const gchar* v)
+{
 	PublishingRajceArgItem* self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	PublishingRajceArgItem** _tmp4_;
+	PublishingRajceArgItem** _tmp2_;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajceArgItem*) g_type_create_instance (object_type);
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = k;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (k);
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->key);
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->key = _tmp1_;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = v;
+	self->key = _tmp0_;
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (v);
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->val);
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->val = _tmp3_;
+	self->val = _tmp1_;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
+	_tmp2_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->children = _tmp4_;
+	self->children = _tmp2_;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->children_length1 = 0;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->_children_size_ = self->children_length1;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8973 "RajcePublishing.c"
+#line 9345 "RajcePublishing.c"
 }
 
 
-PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v) {
+PublishingRajceArgItem*
+publishing_rajce_arg_item_new (const gchar* k,
+                               const gchar* v)
+{
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_arg_item_construct (PUBLISHING_RAJCE_TYPE_ARG_ITEM, k, v);
-#line 8980 "RajcePublishing.c"
+#line 9355 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add6 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add6 (PublishingRajceArgItem** * array,
+                  int* length,
+                  int* size,
+                  PublishingRajceArgItem* value)
+{
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 8991 "RajcePublishing.c"
+#line 9371 "RajcePublishing.c"
 	}
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 8997 "RajcePublishing.c"
+#line 9377 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, PublishingRajceArgItem* child) {
+void
+publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self,
+                                    PublishingRajceArgItem* child)
+{
 	PublishingRajceArgItem** _tmp0_;
 	gint _tmp0__length1;
 	PublishingRajceArgItem* _tmp1_;
-	PublishingRajceArgItem* _tmp2_;
 #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self));
 #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9015,157 +9397,178 @@ void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, Publishin
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0__length1 = self->children_length1;
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = child;
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = _publishing_rajce_arg_item_ref0 (_tmp1_);
+	_tmp1_ = _publishing_rajce_arg_item_ref0 (child);
 #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add6 (&self->children, &self->children_length1, &self->_children_size_, _tmp2_);
-#line 9020 "RajcePublishing.c"
+	_vala_array_add6 (&self->children, &self->children_length1, &self->_children_size_, _tmp1_);
+#line 9400 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1) {
-	PublishingRajceArgItem** _tmp0_;
-	gint _tmp0__length1;
+void
+publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self,
+                                       PublishingRajceArgItem** newchildren,
+                                       int newchildren_length1)
+{
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self));
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = newchildren;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0__length1 = newchildren_length1;
-#line 9033 "RajcePublishing.c"
+#line 9411 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** child_collection = NULL;
 		gint child_collection_length1 = 0;
 		gint _child_collection_size_ = 0;
 		gint child_it = 0;
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		child_collection = _tmp0_;
+		child_collection = newchildren;
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		child_collection_length1 = _tmp0__length1;
+		child_collection_length1 = newchildren_length1;
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) {
-#line 9045 "RajcePublishing.c"
-			PublishingRajceArgItem* _tmp1_;
+		for (child_it = 0; child_it < newchildren_length1; child_it = child_it + 1) {
+#line 9423 "RajcePublishing.c"
+			PublishingRajceArgItem* _tmp0_;
 			PublishingRajceArgItem* child = NULL;
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
+			_tmp0_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			child = _tmp1_;
-#line 9052 "RajcePublishing.c"
+			child = _tmp0_;
+#line 9430 "RajcePublishing.c"
 			{
-				PublishingRajceArgItem* _tmp2_;
+				PublishingRajceArgItem* _tmp1_;
 #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp2_ = child;
+				_tmp1_ = child;
 #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				publishing_rajce_arg_item_AddChild (self, _tmp2_);
+				publishing_rajce_arg_item_AddChild (self, _tmp1_);
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
-#line 9061 "RajcePublishing.c"
+#line 9439 "RajcePublishing.c"
 			}
 		}
 	}
 }
 
 
-static void publishing_rajce_value_arg_item_init (GValue* value) {
+static void
+publishing_rajce_value_arg_item_init (GValue* value)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 9071 "RajcePublishing.c"
+#line 9451 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_value_arg_item_free_value (GValue* value) {
+static void
+publishing_rajce_value_arg_item_free_value (GValue* value)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_unref (value->data[0].v_pointer);
-#line 9080 "RajcePublishing.c"
+#line 9462 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_value_arg_item_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_arg_item_copy_value (const GValue* src_value,
+                                            GValue* dest_value)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_rajce_arg_item_ref (src_value->data[0].v_pointer);
-#line 9090 "RajcePublishing.c"
+#line 9475 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9094 "RajcePublishing.c"
+#line 9479 "RajcePublishing.c"
 	}
 }
 
 
-static gpointer publishing_rajce_value_arg_item_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_arg_item_peek_pointer (const GValue* value)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9102 "RajcePublishing.c"
+#line 9489 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_arg_item_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_arg_item_collect_value (GValue* value,
+                                               guint n_collect_values,
+                                               GTypeCValue* collect_values,
+                                               guint collect_flags)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9109 "RajcePublishing.c"
+#line 9501 "RajcePublishing.c"
 		PublishingRajceArgItem * object;
 		object = collect_values[0].v_pointer;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9116 "RajcePublishing.c"
+#line 9508 "RajcePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 9120 "RajcePublishing.c"
+#line 9512 "RajcePublishing.c"
 		}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = publishing_rajce_arg_item_ref (object);
-#line 9124 "RajcePublishing.c"
+#line 9516 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9128 "RajcePublishing.c"
+#line 9520 "RajcePublishing.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9132 "RajcePublishing.c"
+#line 9524 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_arg_item_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_arg_item_lcopy_value (const GValue* value,
+                                             guint n_collect_values,
+                                             GTypeCValue* collect_values,
+                                             guint collect_flags)
+{
 	PublishingRajceArgItem ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!object_p) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9143 "RajcePublishing.c"
+#line 9540 "RajcePublishing.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = NULL;
-#line 9149 "RajcePublishing.c"
+#line 9546 "RajcePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9153 "RajcePublishing.c"
+#line 9550 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = publishing_rajce_arg_item_ref (value->data[0].v_pointer);
-#line 9157 "RajcePublishing.c"
+#line 9554 "RajcePublishing.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9161 "RajcePublishing.c"
+#line 9558 "RajcePublishing.c"
 }
 
 
-GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_arg_item (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags)
+{
 	PublishingRajceParamSpecArgItem* spec;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL);
@@ -9175,20 +9578,25 @@ GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9175 "RajcePublishing.c"
+#line 9578 "RajcePublishing.c"
 }
 
 
-gpointer publishing_rajce_value_get_arg_item (const GValue* value) {
+gpointer
+publishing_rajce_value_get_arg_item (const GValue* value)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL);
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9184 "RajcePublishing.c"
+#line 9589 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_arg_item (GValue* value,
+                                     gpointer v_object)
+{
 	PublishingRajceArgItem * old;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
@@ -9204,22 +9612,25 @@ void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_ref (value->data[0].v_pointer);
-#line 9204 "RajcePublishing.c"
+#line 9612 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9208 "RajcePublishing.c"
+#line 9616 "RajcePublishing.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_unref (old);
-#line 9214 "RajcePublishing.c"
+#line 9622 "RajcePublishing.c"
 	}
 }
 
 
-void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_arg_item (GValue* value,
+                                      gpointer v_object)
+{
 	PublishingRajceArgItem * old;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
@@ -9233,38 +9644,44 @@ void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9233 "RajcePublishing.c"
+#line 9644 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9237 "RajcePublishing.c"
+#line 9648 "RajcePublishing.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_unref (old);
-#line 9243 "RajcePublishing.c"
+#line 9654 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass * klass) {
+static void
+publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass * klass)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_arg_item_parent_class = g_type_class_peek_parent (klass);
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRajceArgItemClass *) klass)->finalize = publishing_rajce_arg_item_finalize;
-#line 9253 "RajcePublishing.c"
+#line 9666 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_arg_item_instance_init (PublishingRajceArgItem * self) {
+static void
+publishing_rajce_arg_item_instance_init (PublishingRajceArgItem * self)
+{
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->ref_count = 1;
-#line 9260 "RajcePublishing.c"
+#line 9675 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
+static void
+publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj)
+{
 	PublishingRajceArgItem * self;
 	PublishingRajceArgItem** _tmp0_;
 	gint _tmp0__length1;
@@ -9276,7 +9693,7 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
 	_tmp0_ = self->children;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0__length1 = self->children_length1;
-#line 9276 "RajcePublishing.c"
+#line 9693 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** child_collection = NULL;
 		gint child_collection_length1 = 0;
@@ -9288,14 +9705,14 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
 		child_collection_length1 = _tmp0__length1;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) {
-#line 9288 "RajcePublishing.c"
+#line 9705 "RajcePublishing.c"
 			PublishingRajceArgItem* _tmp1_;
 			PublishingRajceArgItem* child = NULL;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			child = _tmp1_;
-#line 9295 "RajcePublishing.c"
+#line 9712 "RajcePublishing.c"
 			{
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
@@ -9303,7 +9720,7 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
 				child = NULL;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
-#line 9303 "RajcePublishing.c"
+#line 9720 "RajcePublishing.c"
 			}
 		}
 	}
@@ -9313,11 +9730,13 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
 	_g_free0 (self->val);
 #line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
-#line 9313 "RajcePublishing.c"
+#line 9730 "RajcePublishing.c"
 }
 
 
-GType publishing_rajce_arg_item_get_type (void) {
+GType
+publishing_rajce_arg_item_get_type (void)
+{
 	static volatile gsize publishing_rajce_arg_item_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_arg_item_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_arg_item_init, publishing_rajce_value_arg_item_free_value, publishing_rajce_value_arg_item_copy_value, publishing_rajce_value_arg_item_peek_pointer, "p", publishing_rajce_value_arg_item_collect_value, "p", publishing_rajce_value_arg_item_lcopy_value };
@@ -9331,18 +9750,22 @@ GType publishing_rajce_arg_item_get_type (void) {
 }
 
 
-gpointer publishing_rajce_arg_item_ref (gpointer instance) {
+gpointer
+publishing_rajce_arg_item_ref (gpointer instance)
+{
 	PublishingRajceArgItem * self;
 	self = instance;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return instance;
-#line 9338 "RajcePublishing.c"
+#line 9759 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_arg_item_unref (gpointer instance) {
+void
+publishing_rajce_arg_item_unref (gpointer instance)
+{
 	PublishingRajceArgItem * self;
 	self = instance;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9351,16 +9774,18 @@ void publishing_rajce_arg_item_unref (gpointer instance) {
 		PUBLISHING_RAJCE_ARG_ITEM_GET_CLASS (self)->finalize (self);
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9351 "RajcePublishing.c"
+#line 9774 "RajcePublishing.c"
 	}
 }
 
 
-PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type, const gchar* cmd) {
+PublishingRajceLiveApiRequest*
+publishing_rajce_live_api_request_construct (GType object_type,
+                                             const gchar* cmd)
+{
 	PublishingRajceLiveApiRequest* self = NULL;
 	PublishingRajceArgItem** _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
+	gchar* _tmp1_;
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (cmd != NULL, NULL);
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9376,49 +9801,56 @@ PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GTyp
 #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->__params_size_ = self->priv->_params_length1;
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = cmd;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (cmd);
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->_cmd);
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->_cmd = _tmp2_;
+	self->priv->_cmd = _tmp1_;
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 9385 "RajcePublishing.c"
+#line 9808 "RajcePublishing.c"
 }
 
 
-PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd) {
+PublishingRajceLiveApiRequest*
+publishing_rajce_live_api_request_new (const gchar* cmd)
+{
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_live_api_request_construct (PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, cmd);
-#line 9392 "RajcePublishing.c"
+#line 9817 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add7 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add7 (PublishingRajceArgItem** * array,
+                  int* length,
+                  int* size,
+                  PublishingRajceArgItem* value)
+{
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 9403 "RajcePublishing.c"
+#line 9833 "RajcePublishing.c"
 	}
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 9409 "RajcePublishing.c"
+#line 9839 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self, const gchar* name, const gchar* val) {
+void
+publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self,
+                                            const gchar* name,
+                                            const gchar* val)
+{
 	PublishingRajceArgItem** _tmp0_;
 	gint _tmp0__length1;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRajceArgItem* _tmp3_;
+	PublishingRajceArgItem* _tmp1_;
 #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
 #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9430,127 +9862,123 @@ void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest*
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0__length1 = self->priv->_params_length1;
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = name;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = val;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = publishing_rajce_arg_item_new (_tmp1_, _tmp2_);
+	_tmp1_ = publishing_rajce_arg_item_new (name, val);
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add7 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp3_);
-#line 9437 "RajcePublishing.c"
+	_vala_array_add7 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp1_);
+#line 9865 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self, const gchar* name, gboolean val) {
+void
+publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self,
+                                                const gchar* name,
+                                                gboolean val)
+{
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_;
-	const gchar* _tmp2_;
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = val;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp1_) {
+	if (val) {
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = "1";
-#line 9455 "RajcePublishing.c"
+#line 9883 "RajcePublishing.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = "0";
-#line 9459 "RajcePublishing.c"
+#line 9887 "RajcePublishing.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = name;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (self, _tmp2_, _tmp0_);
-#line 9465 "RajcePublishing.c"
+	publishing_rajce_live_api_request_AddParam (self, name, _tmp0_);
+#line 9891 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self, const gchar* name, gint val) {
-	const gchar* _tmp0_;
-	gint _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
+void
+publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self,
+                                               const gchar* name,
+                                               gint val)
+{
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
 #line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = name;
+	_tmp0_ = g_strdup_printf ("%i", val);
 #line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = val;
+	_tmp1_ = _tmp0_;
 #line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = g_strdup_printf ("%i", _tmp1_);
+	publishing_rajce_live_api_request_AddParam (self, name, _tmp1_);
 #line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (self, _tmp0_, _tmp3_);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp3_);
-#line 9490 "RajcePublishing.c"
+	_g_free0 (_tmp1_);
+#line 9914 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add8 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add8 (PublishingRajceArgItem** * array,
+                  int* length,
+                  int* size,
+                  PublishingRajceArgItem* value)
+{
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 9501 "RajcePublishing.c"
+#line 9930 "RajcePublishing.c"
 	}
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 9507 "RajcePublishing.c"
+#line 9936 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self, const gchar* name, PublishingRajceArgItem** val, int val_length1) {
+void
+publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self,
+                                                const gchar* name,
+                                                PublishingRajceArgItem** val,
+                                                int val_length1)
+{
 	PublishingRajceArgItem* newItem = NULL;
-	const gchar* _tmp0_;
-	PublishingRajceArgItem* _tmp1_;
-	PublishingRajceArgItem** _tmp2_;
-	gint _tmp2__length1;
-	PublishingRajceArgItem** _tmp3_;
-	gint _tmp3__length1;
-	PublishingRajceArgItem* _tmp4_;
+	PublishingRajceArgItem* _tmp0_;
+	PublishingRajceArgItem** _tmp1_;
+	gint _tmp1__length1;
+	PublishingRajceArgItem* _tmp2_;
 #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
 #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
 #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = name;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = publishing_rajce_arg_item_new (_tmp0_, NULL);
+	_tmp0_ = publishing_rajce_arg_item_new (name, NULL);
 #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	newItem = _tmp1_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = val;
+	newItem = _tmp0_;
 #line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2__length1 = val_length1;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_arg_item_AddChildren (newItem, _tmp2_, _tmp2__length1);
+	publishing_rajce_arg_item_AddChildren (newItem, val, val_length1);
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = self->priv->_params;
+	_tmp1_ = self->priv->_params;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3__length1 = self->priv->_params_length1;
+	_tmp1__length1 = self->priv->_params_length1;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = _publishing_rajce_arg_item_ref0 (newItem);
+	_tmp2_ = _publishing_rajce_arg_item_ref0 (newItem);
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp4_);
+	_vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp2_);
 #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_arg_item_unref0 (newItem);
-#line 9546 "RajcePublishing.c"
+#line 9971 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self, gboolean urlencode) {
+gchar*
+publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self,
+                                                    gboolean urlencode)
+{
 	gchar* result = NULL;
 	xmlDoc* doc = NULL;
 	xmlDoc* _tmp0_;
@@ -9569,7 +9997,6 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 	xmlDoc* _tmp12_;
 	gchar* _tmp13_ = NULL;
 	xmlDoc* _tmp14_;
-	gboolean _tmp15_;
 #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self), NULL);
 #line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9602,7 +10029,7 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 	_tmp8_ = self->priv->_params;
 #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8__length1 = self->priv->_params_length1;
-#line 9602 "RajcePublishing.c"
+#line 10029 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -9614,14 +10041,14 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 		arg_collection_length1 = _tmp8__length1;
 #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		for (arg_it = 0; arg_it < _tmp8__length1; arg_it = arg_it + 1) {
-#line 9614 "RajcePublishing.c"
+#line 10041 "RajcePublishing.c"
 			PublishingRajceArgItem* _tmp9_;
 			PublishingRajceArgItem* arg = NULL;
 #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp9_ = _publishing_rajce_arg_item_ref0 (arg_collection[arg_it]);
 #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			arg = _tmp9_;
-#line 9621 "RajcePublishing.c"
+#line 10048 "RajcePublishing.c"
 			{
 				xmlNode* _tmp10_;
 				PublishingRajceArgItem* _tmp11_;
@@ -9633,7 +10060,7 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 				publishing_rajce_live_api_request_WriteParam (_tmp10_, _tmp11_);
 #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (arg);
-#line 9633 "RajcePublishing.c"
+#line 10060 "RajcePublishing.c"
 			}
 		}
 	}
@@ -9650,122 +10077,102 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	xmlFreeDoc (_tmp14_);
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp15_ = urlencode;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp15_) {
-#line 9653 "RajcePublishing.c"
-		const gchar* _tmp16_;
-		gchar* _tmp17_;
+	if (urlencode) {
+#line 10078 "RajcePublishing.c"
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = xmlstr;
+		_tmp15_ = xmlstr;
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = soup_uri_encode (_tmp16_, "&;");
+		_tmp16_ = soup_uri_encode (_tmp15_, "&;");
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		result = _tmp17_;
+		result = _tmp16_;
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (xmlstr);
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 9666 "RajcePublishing.c"
+#line 10091 "RajcePublishing.c"
 	}
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = xmlstr;
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 9672 "RajcePublishing.c"
+#line 10097 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, PublishingRajceArgItem* arg) {
-	PublishingRajceArgItem* _tmp0_;
-	PublishingRajceArgItem** _tmp1_;
-	gint _tmp1__length1;
+static void
+publishing_rajce_live_api_request_WriteParam (xmlNode* node,
+                                              PublishingRajceArgItem* arg)
+{
+	PublishingRajceArgItem** _tmp0_;
+	gint _tmp0__length1;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (arg));
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = arg;
+	_tmp0_ = arg->children;
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = _tmp0_->children;
+	_tmp0__length1 = arg->children_length1;
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1__length1 = _tmp0_->children_length1;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp1__length1 == 0) {
-#line 9690 "RajcePublishing.c"
-		xmlNode* _tmp2_;
-		PublishingRajceArgItem* _tmp3_;
-		const gchar* _tmp4_;
-		PublishingRajceArgItem* _tmp5_;
-		const gchar* _tmp6_;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp2_ = node;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3_ = arg;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp4_ = _tmp3_->key;
+	if (_tmp0__length1 == 0) {
+#line 10115 "RajcePublishing.c"
+		const gchar* _tmp1_;
+		const gchar* _tmp2_;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp5_ = arg;
+		_tmp1_ = arg->key;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp6_ = _tmp5_->val;
+		_tmp2_ = arg->val;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		xmlNewTextChild (_tmp2_, NULL, (xmlChar*) _tmp4_, (xmlChar*) _tmp6_);
-#line 9708 "RajcePublishing.c"
+		xmlNewTextChild (node, NULL, (xmlChar*) _tmp1_, (xmlChar*) _tmp2_);
+#line 10124 "RajcePublishing.c"
 	} else {
 		xmlNode* subnode = NULL;
-		xmlNode* _tmp7_;
-		PublishingRajceArgItem* _tmp8_;
-		const gchar* _tmp9_;
-		xmlNode* _tmp10_;
-		PublishingRajceArgItem* _tmp11_;
-		PublishingRajceArgItem** _tmp12_;
-		gint _tmp12__length1;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = node;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp8_ = arg;
+		const gchar* _tmp3_;
+		xmlNode* _tmp4_;
+		PublishingRajceArgItem** _tmp5_;
+		gint _tmp5__length1;
 #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = _tmp8_->key;
+		_tmp3_ = arg->key;
 #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = xmlNewTextChild (_tmp7_, NULL, (xmlChar*) _tmp9_, (xmlChar*) "");
+		_tmp4_ = xmlNewTextChild (node, NULL, (xmlChar*) _tmp3_, (xmlChar*) "");
 #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		subnode = _tmp10_;
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = arg;
+		subnode = _tmp4_;
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = _tmp11_->children;
+		_tmp5_ = arg->children;
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12__length1 = _tmp11_->children_length1;
-#line 9734 "RajcePublishing.c"
+		_tmp5__length1 = arg->children_length1;
+#line 10141 "RajcePublishing.c"
 		{
 			PublishingRajceArgItem** child_collection = NULL;
 			gint child_collection_length1 = 0;
 			gint _child_collection_size_ = 0;
 			gint child_it = 0;
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			child_collection = _tmp12_;
+			child_collection = _tmp5_;
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			child_collection_length1 = _tmp12__length1;
+			child_collection_length1 = _tmp5__length1;
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			for (child_it = 0; child_it < _tmp12__length1; child_it = child_it + 1) {
-#line 9746 "RajcePublishing.c"
-				PublishingRajceArgItem* _tmp13_;
+			for (child_it = 0; child_it < _tmp5__length1; child_it = child_it + 1) {
+#line 10153 "RajcePublishing.c"
+				PublishingRajceArgItem* _tmp6_;
 				PublishingRajceArgItem* child = NULL;
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp13_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
+				_tmp6_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				child = _tmp13_;
-#line 9753 "RajcePublishing.c"
+				child = _tmp6_;
+#line 10160 "RajcePublishing.c"
 				{
-					xmlNode* _tmp14_;
-					PublishingRajceArgItem* _tmp15_;
+					xmlNode* _tmp7_;
+					PublishingRajceArgItem* _tmp8_;
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp14_ = subnode;
+					_tmp7_ = subnode;
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					_tmp15_ = child;
+					_tmp8_ = child;
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-					publishing_rajce_live_api_request_WriteParam (_tmp14_, _tmp15_);
+					publishing_rajce_live_api_request_WriteParam (_tmp7_, _tmp8_);
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_publishing_rajce_arg_item_unref0 (child);
-#line 9765 "RajcePublishing.c"
+#line 10172 "RajcePublishing.c"
 				}
 			}
 		}
@@ -9773,104 +10180,129 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 }
 
 
-static void publishing_rajce_value_live_api_request_init (GValue* value) {
+static void
+publishing_rajce_value_live_api_request_init (GValue* value)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 9776 "RajcePublishing.c"
+#line 10185 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_value_live_api_request_free_value (GValue* value) {
+static void
+publishing_rajce_value_live_api_request_free_value (GValue* value)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_unref (value->data[0].v_pointer);
-#line 9785 "RajcePublishing.c"
+#line 10196 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_value_live_api_request_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_live_api_request_copy_value (const GValue* src_value,
+                                                    GValue* dest_value)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_rajce_live_api_request_ref (src_value->data[0].v_pointer);
-#line 9795 "RajcePublishing.c"
+#line 10209 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9799 "RajcePublishing.c"
+#line 10213 "RajcePublishing.c"
 	}
 }
 
 
-static gpointer publishing_rajce_value_live_api_request_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_live_api_request_peek_pointer (const GValue* value)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9807 "RajcePublishing.c"
+#line 10223 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_live_api_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_live_api_request_collect_value (GValue* value,
+                                                       guint n_collect_values,
+                                                       GTypeCValue* collect_values,
+                                                       guint collect_flags)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9814 "RajcePublishing.c"
+#line 10235 "RajcePublishing.c"
 		PublishingRajceLiveApiRequest * object;
 		object = collect_values[0].v_pointer;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9821 "RajcePublishing.c"
+#line 10242 "RajcePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 9825 "RajcePublishing.c"
+#line 10246 "RajcePublishing.c"
 		}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = publishing_rajce_live_api_request_ref (object);
-#line 9829 "RajcePublishing.c"
+#line 10250 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9833 "RajcePublishing.c"
+#line 10254 "RajcePublishing.c"
 	}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9837 "RajcePublishing.c"
+#line 10258 "RajcePublishing.c"
 }
 
 
-static gchar* publishing_rajce_value_live_api_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_live_api_request_lcopy_value (const GValue* value,
+                                                     guint n_collect_values,
+                                                     GTypeCValue* collect_values,
+                                                     guint collect_flags)
+{
 	PublishingRajceLiveApiRequest ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!object_p) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9848 "RajcePublishing.c"
+#line 10274 "RajcePublishing.c"
 	}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = NULL;
-#line 9854 "RajcePublishing.c"
+#line 10280 "RajcePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9858 "RajcePublishing.c"
+#line 10284 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = publishing_rajce_live_api_request_ref (value->data[0].v_pointer);
-#line 9862 "RajcePublishing.c"
+#line 10288 "RajcePublishing.c"
 	}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9866 "RajcePublishing.c"
+#line 10292 "RajcePublishing.c"
 }
 
 
-GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_live_api_request (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags)
+{
 	PublishingRajceParamSpecLiveApiRequest* spec;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL);
@@ -9880,20 +10312,25 @@ GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9880 "RajcePublishing.c"
+#line 10312 "RajcePublishing.c"
 }
 
 
-gpointer publishing_rajce_value_get_live_api_request (const GValue* value) {
+gpointer
+publishing_rajce_value_get_live_api_request (const GValue* value)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL);
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9889 "RajcePublishing.c"
+#line 10323 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_live_api_request (GValue* value,
+                                             gpointer v_object)
+{
 	PublishingRajceLiveApiRequest * old;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
@@ -9909,22 +10346,25 @@ void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_ref (value->data[0].v_pointer);
-#line 9909 "RajcePublishing.c"
+#line 10346 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9913 "RajcePublishing.c"
+#line 10350 "RajcePublishing.c"
 	}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_unref (old);
-#line 9919 "RajcePublishing.c"
+#line 10356 "RajcePublishing.c"
 	}
 }
 
 
-void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_live_api_request (GValue* value,
+                                              gpointer v_object)
+{
 	PublishingRajceLiveApiRequest * old;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
@@ -9938,42 +10378,48 @@ void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9938 "RajcePublishing.c"
+#line 10378 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9942 "RajcePublishing.c"
+#line 10382 "RajcePublishing.c"
 	}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_unref (old);
-#line 9948 "RajcePublishing.c"
+#line 10388 "RajcePublishing.c"
 	}
 }
 
 
-static void publishing_rajce_live_api_request_class_init (PublishingRajceLiveApiRequestClass * klass) {
+static void
+publishing_rajce_live_api_request_class_init (PublishingRajceLiveApiRequestClass * klass)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_parent_class = g_type_class_peek_parent (klass);
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRajceLiveApiRequestClass *) klass)->finalize = publishing_rajce_live_api_request_finalize;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRajceLiveApiRequestPrivate));
-#line 9960 "RajcePublishing.c"
+#line 10402 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_live_api_request_instance_init (PublishingRajceLiveApiRequest * self) {
+static void
+publishing_rajce_live_api_request_instance_init (PublishingRajceLiveApiRequest * self)
+{
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_PRIVATE (self);
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->ref_count = 1;
-#line 9969 "RajcePublishing.c"
+#line 10413 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj) {
+static void
+publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj)
+{
 	PublishingRajceLiveApiRequest * self;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, PublishingRajceLiveApiRequest);
@@ -9983,11 +10429,13 @@ static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRe
 	self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
 #line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->_cmd);
-#line 9983 "RajcePublishing.c"
+#line 10429 "RajcePublishing.c"
 }
 
 
-GType publishing_rajce_live_api_request_get_type (void) {
+GType
+publishing_rajce_live_api_request_get_type (void)
+{
 	static volatile gsize publishing_rajce_live_api_request_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_live_api_request_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_live_api_request_init, publishing_rajce_value_live_api_request_free_value, publishing_rajce_value_live_api_request_copy_value, publishing_rajce_value_live_api_request_peek_pointer, "p", publishing_rajce_value_live_api_request_collect_value, "p", publishing_rajce_value_live_api_request_lcopy_value };
@@ -10001,18 +10449,22 @@ GType publishing_rajce_live_api_request_get_type (void) {
 }
 
 
-gpointer publishing_rajce_live_api_request_ref (gpointer instance) {
+gpointer
+publishing_rajce_live_api_request_ref (gpointer instance)
+{
 	PublishingRajceLiveApiRequest * self;
 	self = instance;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return instance;
-#line 10008 "RajcePublishing.c"
+#line 10458 "RajcePublishing.c"
 }
 
 
-void publishing_rajce_live_api_request_unref (gpointer instance) {
+void
+publishing_rajce_live_api_request_unref (gpointer instance)
+{
 	PublishingRajceLiveApiRequest * self;
 	self = instance;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10021,138 +10473,134 @@ void publishing_rajce_live_api_request_unref (gpointer instance) {
 		PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_CLASS (self)->finalize (self);
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 10021 "RajcePublishing.c"
+#line 10473 "RajcePublishing.c"
 	}
 }
 
 
-PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session) {
+PublishingRajceTransaction*
+publishing_rajce_transaction_construct (GType object_type,
+                                        PublishingRajceSession* session)
+{
 	PublishingRajceTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
 #line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceTransaction*) 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 = (PublishingRajceTransaction*) 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 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10037 "RajcePublishing.c"
+#line 10489 "RajcePublishing.c"
 }
 
 
-PublishingRajceTransaction* publishing_rajce_transaction_new (PublishingRajceSession* session) {
+PublishingRajceTransaction*
+publishing_rajce_transaction_new (PublishingRajceSession* session)
+{
 #line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_transaction_construct (PUBLISHING_RAJCE_TYPE_TRANSACTION, session);
-#line 10044 "RajcePublishing.c"
+#line 10498 "RajcePublishing.c"
 }
 
 
-gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_;
+	xmlNode* _tmp0_;
 	xmlNode* _tmp1_;
-	xmlNode* _tmp2_;
 	gchar* name = NULL;
-	xmlNode* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_;
+	xmlNode* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_ = FALSE;
+	const gchar* _tmp7_;
 	xmlNode* errcode = NULL;
 	xmlNode* _result_ = NULL;
+	xmlNode* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
 	xmlNode* _tmp19_;
 	gchar* _tmp20_;
 	gchar* _tmp21_;
-	gint _tmp22_;
-	xmlNode* _tmp23_;
-	gchar* _tmp24_;
-	gchar* _tmp25_;
-	gchar* _tmp26_;
-	gchar* _tmp27_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
 	GError * _inner_error_ = NULL;
 #line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
 #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = doc;
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
+	_tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
 #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	root = _tmp1_;
+	root = _tmp0_;
 #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = root;
+	_tmp1_ = root;
 #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp2_ == NULL) {
-#line 10084 "RajcePublishing.c"
-		gchar* _tmp3_;
+	if (_tmp1_ == NULL) {
+#line 10536 "RajcePublishing.c"
+		gchar* _tmp2_;
 #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp3_ = g_strdup ("No XML returned from server");
+		_tmp2_ = g_strdup ("No XML returned from server");
 #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		result = _tmp3_;
+		result = _tmp2_;
 #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10092 "RajcePublishing.c"
+#line 10544 "RajcePublishing.c"
 	}
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = root;
+	_tmp3_ = root;
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _tmp4_->name;
+	_tmp4_ = _tmp3_->name;
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp5_ = g_strdup (_tmp4_);
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	name = _tmp6_;
+	name = _tmp5_;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = name;
+	_tmp7_ = name;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp8_ == NULL) {
+	if (_tmp7_ == NULL) {
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = TRUE;
-#line 10108 "RajcePublishing.c"
+		_tmp6_ = TRUE;
+#line 10560 "RajcePublishing.c"
 	} else {
-		const gchar* _tmp9_;
+		const gchar* _tmp8_;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp9_ = name;
+		_tmp8_ = name;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp7_ = g_strcmp0 (_tmp9_, "response") != 0;
-#line 10115 "RajcePublishing.c"
+		_tmp6_ = g_strcmp0 (_tmp8_, "response") != 0;
+#line 10567 "RajcePublishing.c"
 	}
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp7_) {
-#line 10119 "RajcePublishing.c"
-		gchar* _tmp10_;
+	if (_tmp6_) {
+#line 10571 "RajcePublishing.c"
+		gchar* _tmp9_;
 #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp10_ = g_strdup ("No response from Rajce in XML");
+		_tmp9_ = g_strdup ("No response from Rajce in XML");
 #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		result = _tmp10_;
+		result = _tmp9_;
 #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (name);
 #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10129 "RajcePublishing.c"
+#line 10581 "RajcePublishing.c"
 	}
 	{
-		xmlNode* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_;
-		xmlNode* _tmp13_;
+		xmlNode* _tmp10_ = NULL;
+		xmlNode* _tmp11_;
+		xmlNode* _tmp12_;
+		xmlNode* _tmp13_ = NULL;
 		xmlNode* _tmp14_;
-		xmlNode* _tmp15_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp16_;
-		xmlNode* _tmp17_;
-		xmlNode* _tmp18_;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp12_ = doc;
+		xmlNode* _tmp15_;
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp13_ = root;
+		_tmp11_ = root;
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "errorCode", &_inner_error_);
+		_tmp12_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp11_, "errorCode", &_inner_error_);
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp11_ = _tmp14_;
+		_tmp10_ = _tmp12_;
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10152 "RajcePublishing.c"
+#line 10600 "RajcePublishing.c"
 				goto __catch31_spit_publishing_publishing_error;
 			}
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10163,23 +10611,21 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 			g_clear_error (&_inner_error_);
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return NULL;
-#line 10163 "RajcePublishing.c"
+#line 10611 "RajcePublishing.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		errcode = _tmp11_;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp16_ = doc;
+		errcode = _tmp10_;
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp17_ = root;
+		_tmp14_ = root;
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "result", &_inner_error_);
+		_tmp15_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp14_, "result", &_inner_error_);
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp15_ = _tmp18_;
+		_tmp13_ = _tmp15_;
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10179 "RajcePublishing.c"
+#line 10625 "RajcePublishing.c"
 				goto __catch31_spit_publishing_publishing_error;
 			}
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10190,11 +10636,11 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 			g_clear_error (&_inner_error_);
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return NULL;
-#line 10190 "RajcePublishing.c"
+#line 10636 "RajcePublishing.c"
 		}
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_result_ = _tmp15_;
-#line 10194 "RajcePublishing.c"
+		_result_ = _tmp13_;
+#line 10640 "RajcePublishing.c"
 	}
 	goto __finally31;
 	__catch31_spit_publishing_publishing_error:
@@ -10212,7 +10658,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 		_g_free0 (name);
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10212 "RajcePublishing.c"
+#line 10658 "RajcePublishing.c"
 	}
 	__finally31:
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10225,48 +10671,50 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 		g_clear_error (&_inner_error_);
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return NULL;
-#line 10225 "RajcePublishing.c"
+#line 10671 "RajcePublishing.c"
 	}
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp19_ = errcode;
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp20_ = (gchar*) xmlNodeGetContent (_tmp19_);
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp21_ = _tmp20_;
+	_tmp16_ = errcode;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp22_ = atoi (_tmp21_);
+	_tmp17_ = (gchar*) xmlNodeGetContent (_tmp16_);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp23_ = _result_;
+	_tmp18_ = _tmp17_;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
+	_tmp19_ = _result_;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp25_ = _tmp24_;
+	_tmp20_ = (gchar*) xmlNodeGetContent (_tmp19_);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp26_ = g_strdup_printf ("999 Rajce Error [%d]: %s", _tmp22_, _tmp25_);
+	_tmp21_ = _tmp20_;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp27_ = _tmp26_;
+	_tmp22_ = g_strdup_printf ("999 Rajce Error [%d]: %s", atoi (_tmp18_), _tmp21_);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp25_);
+	_tmp23_ = _tmp22_;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp21_);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	result = _tmp27_;
+	_g_free0 (_tmp18_);
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	result = _tmp23_;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (name);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 10255 "RajcePublishing.c"
+#line 10699 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_transaction_class_init (PublishingRajceTransactionClass * klass) {
+static void
+publishing_rajce_transaction_class_init (PublishingRajceTransactionClass * klass)
+{
 #line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10262 "RajcePublishing.c"
+#line 10708 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_transaction_instance_init (PublishingRajceTransaction * self) {
+static void
+publishing_rajce_transaction_instance_init (PublishingRajceTransaction * self)
+{
 }
 
 
@@ -10276,7 +10724,9 @@ static void publishing_rajce_transaction_instance_init (PublishingRajceTransacti
  * This class implements the generic logic for all REST transactions used
  * by the Rajce publishing plugin.
  */
-GType publishing_rajce_transaction_get_type (void) {
+GType
+publishing_rajce_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceTransaction), 0, (GInstanceInitFunc) publishing_rajce_transaction_instance_init, NULL };
@@ -10288,17 +10738,18 @@ GType publishing_rajce_transaction_get_type (void) {
 }
 
 
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) {
+PublishingRajceSessionLoginTransaction*
+publishing_rajce_session_login_transaction_construct (GType object_type,
+                                                      PublishingRajceSession* session,
+                                                      const gchar* url,
+                                                      const gchar* username,
+                                                      const gchar* token)
+{
 	PublishingRajceSessionLoginTransaction* self = NULL;
-	const gchar* _tmp0_;
-	PublishingRajceSession* _tmp1_;
-	const gchar* _tmp2_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp5_;
+	PublishingRajceLiveApiRequest* _tmp0_;
 	gchar* xml = NULL;
-	gchar* _tmp6_;
+	gchar* _tmp1_;
 #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10308,35 +10759,25 @@ PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transacti
 #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (token != NULL, NULL);
 #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = url;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:1397: SessionLoginTransaction: URL: %s", _tmp0_);
+	g_debug ("RajcePublishing.vala:1397: SessionLoginTransaction: URL: %s", url);
 #line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = session;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = url;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingRajceSessionLoginTransaction*) 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 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = publishing_rajce_live_api_request_new ("login");
+	_tmp0_ = publishing_rajce_live_api_request_new ("login");
 #line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp3_;
+	req = _tmp0_;
 #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "clientID", "RajceShotwellPlugin");
 #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "currentVersion", "1.1.1.1");
 #line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = username;
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "login", _tmp4_);
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = token;
+	publishing_rajce_live_api_request_AddParam (req, "login", username);
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "password", _tmp5_);
+	publishing_rajce_live_api_request_AddParam (req, "password", token);
 #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+	_tmp1_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
 #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp6_;
+	xml = _tmp1_;
 #line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10345,32 +10786,43 @@ PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transacti
 	_publishing_rajce_live_api_request_unref0 (req);
 #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10345 "RajcePublishing.c"
+#line 10786 "RajcePublishing.c"
 }
 
 
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) {
+PublishingRajceSessionLoginTransaction*
+publishing_rajce_session_login_transaction_new (PublishingRajceSession* session,
+                                                const gchar* url,
+                                                const gchar* username,
+                                                const gchar* token)
+{
 #line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_session_login_transaction_construct (PUBLISHING_RAJCE_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, token);
-#line 10352 "RajcePublishing.c"
+#line 10798 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_session_login_transaction_class_init (PublishingRajceSessionLoginTransactionClass * klass) {
+static void
+publishing_rajce_session_login_transaction_class_init (PublishingRajceSessionLoginTransactionClass * klass)
+{
 #line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10359 "RajcePublishing.c"
+#line 10807 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_session_login_transaction_instance_init (PublishingRajceSessionLoginTransaction * self) {
+static void
+publishing_rajce_session_login_transaction_instance_init (PublishingRajceSessionLoginTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the network login interaction.
  */
-GType publishing_rajce_session_login_transaction_get_type (void) {
+GType
+publishing_rajce_session_login_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_session_login_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_session_login_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceSessionLoginTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_session_login_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceSessionLoginTransaction), 0, (GInstanceInitFunc) publishing_rajce_session_login_transaction_instance_init, NULL };
@@ -10382,205 +10834,225 @@ GType publishing_rajce_session_login_transaction_get_type (void) {
 }
 
 
-static void _vala_array_add9 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add9 (PublishingRajceArgItem** * array,
+                  int* length,
+                  int* size,
+                  PublishingRajceArgItem* value)
+{
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10389 "RajcePublishing.c"
+#line 10846 "RajcePublishing.c"
 	}
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10395 "RajcePublishing.c"
+#line 10852 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add10 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add10 (PublishingRajceArgItem** * array,
+                   int* length,
+                   int* size,
+                   PublishingRajceArgItem* value)
+{
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10406 "RajcePublishing.c"
+#line 10868 "RajcePublishing.c"
 	}
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10412 "RajcePublishing.c"
+#line 10874 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add11 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add11 (PublishingRajceArgItem** * array,
+                   int* length,
+                   int* size,
+                   PublishingRajceArgItem* value)
+{
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10423 "RajcePublishing.c"
+#line 10890 "RajcePublishing.c"
 	}
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10429 "RajcePublishing.c"
+#line 10896 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add12 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add12 (PublishingRajceArgItem** * array,
+                   int* length,
+                   int* size,
+                   PublishingRajceArgItem* value)
+{
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10440 "RajcePublishing.c"
+#line 10912 "RajcePublishing.c"
 	}
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10446 "RajcePublishing.c"
+#line 10918 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add13 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add13 (PublishingRajceArgItem** * array,
+                   int* length,
+                   int* size,
+                   PublishingRajceArgItem* value)
+{
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10457 "RajcePublishing.c"
+#line 10934 "RajcePublishing.c"
 	}
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10463 "RajcePublishing.c"
+#line 10940 "RajcePublishing.c"
 }
 
 
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumsTransaction*
+publishing_rajce_get_albums_transaction_construct (GType object_type,
+                                                   PublishingRajceSession* session,
+                                                   const gchar* url)
+{
 	PublishingRajceGetAlbumsTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_;
-	PublishingRajceSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
+	PublishingRajceLiveApiRequest* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	PublishingRajceArgItem** columns = NULL;
-	PublishingRajceArgItem** _tmp6_;
+	PublishingRajceArgItem** _tmp3_;
 	gint columns_length1;
 	gint _columns_size_;
-	PublishingRajceArgItem** _tmp7_;
-	gint _tmp7__length1;
-	PublishingRajceArgItem* _tmp8_;
-	PublishingRajceArgItem** _tmp9_;
-	gint _tmp9__length1;
-	PublishingRajceArgItem* _tmp10_;
-	PublishingRajceArgItem** _tmp11_;
-	gint _tmp11__length1;
-	PublishingRajceArgItem* _tmp12_;
-	PublishingRajceArgItem** _tmp13_;
-	gint _tmp13__length1;
-	PublishingRajceArgItem* _tmp14_;
-	PublishingRajceArgItem** _tmp15_;
-	gint _tmp15__length1;
-	PublishingRajceArgItem* _tmp16_;
-	PublishingRajceArgItem** _tmp17_;
-	gint _tmp17__length1;
+	PublishingRajceArgItem** _tmp4_;
+	gint _tmp4__length1;
+	PublishingRajceArgItem* _tmp5_;
+	PublishingRajceArgItem** _tmp6_;
+	gint _tmp6__length1;
+	PublishingRajceArgItem* _tmp7_;
+	PublishingRajceArgItem** _tmp8_;
+	gint _tmp8__length1;
+	PublishingRajceArgItem* _tmp9_;
+	PublishingRajceArgItem** _tmp10_;
+	gint _tmp10__length1;
+	PublishingRajceArgItem* _tmp11_;
+	PublishingRajceArgItem** _tmp12_;
+	gint _tmp12__length1;
+	PublishingRajceArgItem* _tmp13_;
+	PublishingRajceArgItem** _tmp14_;
+	gint _tmp14__length1;
 	gchar* xml = NULL;
-	gchar* _tmp18_;
+	gchar* _tmp15_;
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = url;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceGetAlbumsTransaction*) 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 = (PublishingRajceGetAlbumsTransaction*) 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 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_live_api_request_new ("getAlbumList");
+	_tmp0_ = publishing_rajce_live_api_request_new ("getAlbumList");
 #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
+	req = _tmp0_;
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = session;
+	_tmp1_ = publishing_rajce_session_get_usertoken (session);
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+	publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp2_);
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
+	_tmp3_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	columns = _tmp6_;
+	columns = _tmp3_;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	columns_length1 = 0;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_columns_size_ = columns_length1;
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = columns;
+	_tmp4_ = columns;
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7__length1 = columns_length1;
+	_tmp4__length1 = columns_length1;
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = publishing_rajce_arg_item_new ("column", "viewCount");
+	_tmp5_ = publishing_rajce_arg_item_new ("column", "viewCount");
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp8_);
+	_vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp5_);
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = columns;
+	_tmp6_ = columns;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9__length1 = columns_length1;
+	_tmp6__length1 = columns_length1;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = publishing_rajce_arg_item_new ("column", "isFavourite");
+	_tmp7_ = publishing_rajce_arg_item_new ("column", "isFavourite");
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp10_);
+	_vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp7_);
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11_ = columns;
+	_tmp8_ = columns;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11__length1 = columns_length1;
+	_tmp8__length1 = columns_length1;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp12_ = publishing_rajce_arg_item_new ("column", "descriptionHtml");
+	_tmp9_ = publishing_rajce_arg_item_new ("column", "descriptionHtml");
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp12_);
+	_vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp9_);
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp13_ = columns;
+	_tmp10_ = columns;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp13__length1 = columns_length1;
+	_tmp10__length1 = columns_length1;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp14_ = publishing_rajce_arg_item_new ("column", "coverPhotoID");
+	_tmp11_ = publishing_rajce_arg_item_new ("column", "coverPhotoID");
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp14_);
+	_vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp11_);
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp15_ = columns;
+	_tmp12_ = columns;
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp15__length1 = columns_length1;
+	_tmp12__length1 = columns_length1;
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp16_ = publishing_rajce_arg_item_new ("column", "localPath");
+	_tmp13_ = publishing_rajce_arg_item_new ("column", "localPath");
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp16_);
+	_vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp13_);
 #line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp17_ = columns;
+	_tmp14_ = columns;
 #line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp17__length1 = columns_length1;
+	_tmp14__length1 = columns_length1;
 #line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp17_, _tmp17__length1);
+	publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp14_, _tmp14__length1);
 #line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp18_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+	_tmp15_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
 #line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp18_;
+	xml = _tmp15_;
 #line 1427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10591,32 +11063,41 @@ PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_con
 	_publishing_rajce_live_api_request_unref0 (req);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10591 "RajcePublishing.c"
+#line 11063 "RajcePublishing.c"
 }
 
 
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumsTransaction*
+publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session,
+                                             const gchar* url)
+{
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_get_albums_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUMS_TRANSACTION, session, url);
-#line 10598 "RajcePublishing.c"
+#line 11073 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_get_albums_transaction_class_init (PublishingRajceGetAlbumsTransactionClass * klass) {
+static void
+publishing_rajce_get_albums_transaction_class_init (PublishingRajceGetAlbumsTransactionClass * klass)
+{
 #line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_get_albums_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10605 "RajcePublishing.c"
+#line 11082 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_get_albums_transaction_instance_init (PublishingRajceGetAlbumsTransaction * self) {
+static void
+publishing_rajce_get_albums_transaction_instance_init (PublishingRajceGetAlbumsTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the get albums interaction.
  */
-GType publishing_rajce_get_albums_transaction_get_type (void) {
+GType
+publishing_rajce_get_albums_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_get_albums_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_get_albums_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceGetAlbumsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_get_albums_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceGetAlbumsTransaction), 0, (GInstanceInitFunc) publishing_rajce_get_albums_transaction_instance_init, NULL };
@@ -10628,19 +11109,20 @@ GType publishing_rajce_get_albums_transaction_get_type (void) {
 }
 
 
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) {
+PublishingRajceCreateAlbumTransaction*
+publishing_rajce_create_album_transaction_construct (GType object_type,
+                                                     PublishingRajceSession* session,
+                                                     const gchar* url,
+                                                     const gchar* albumName,
+                                                     gboolean hidden)
+{
 	PublishingRajceCreateAlbumTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_;
-	PublishingRajceSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	const gchar* _tmp6_;
-	gboolean _tmp7_;
+	PublishingRajceLiveApiRequest* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* xml = NULL;
-	gchar* _tmp8_;
+	gchar* _tmp3_;
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10648,39 +11130,29 @@ PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (albumName != NULL, NULL);
 #line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = url;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceCreateAlbumTransaction*) 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 = (PublishingRajceCreateAlbumTransaction*) 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 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_live_api_request_new ("createAlbum");
+	_tmp0_ = publishing_rajce_live_api_request_new ("createAlbum");
 #line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
+	req = _tmp0_;
 #line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = session;
+	_tmp1_ = publishing_rajce_session_get_usertoken (session);
 #line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+	_tmp2_ = _tmp1_;
 #line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _tmp4_;
+	publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
 #line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp2_);
 #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = albumName;
-#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "albumName", _tmp6_);
+	publishing_rajce_live_api_request_AddParam (req, "albumName", albumName);
 #line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "albumDescription", "");
 #line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = hidden;
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !_tmp7_);
+	publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !hidden);
 #line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+	_tmp3_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
 #line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp8_;
+	xml = _tmp3_;
 #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10689,32 +11161,43 @@ PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction
 	_publishing_rajce_live_api_request_unref0 (req);
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10689 "RajcePublishing.c"
+#line 11161 "RajcePublishing.c"
 }
 
 
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) {
+PublishingRajceCreateAlbumTransaction*
+publishing_rajce_create_album_transaction_new (PublishingRajceSession* session,
+                                               const gchar* url,
+                                               const gchar* albumName,
+                                               gboolean hidden)
+{
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_create_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CREATE_ALBUM_TRANSACTION, session, url, albumName, hidden);
-#line 10696 "RajcePublishing.c"
+#line 11173 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_create_album_transaction_class_init (PublishingRajceCreateAlbumTransactionClass * klass) {
+static void
+publishing_rajce_create_album_transaction_class_init (PublishingRajceCreateAlbumTransactionClass * klass)
+{
 #line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_create_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10703 "RajcePublishing.c"
+#line 11182 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_create_album_transaction_instance_init (PublishingRajceCreateAlbumTransaction * self) {
+static void
+publishing_rajce_create_album_transaction_instance_init (PublishingRajceCreateAlbumTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the create album interaction.
  */
-GType publishing_rajce_create_album_transaction_get_type (void) {
+GType
+publishing_rajce_create_album_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_create_album_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_create_album_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceCreateAlbumTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_create_album_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceCreateAlbumTransaction), 0, (GInstanceInitFunc) publishing_rajce_create_album_transaction_instance_init, NULL };
@@ -10726,50 +11209,43 @@ GType publishing_rajce_create_album_transaction_get_type (void) {
 }
 
 
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, gint albumID) {
+PublishingRajceOpenAlbumTransaction*
+publishing_rajce_open_album_transaction_construct (GType object_type,
+                                                   PublishingRajceSession* session,
+                                                   const gchar* url,
+                                                   gint albumID)
+{
 	PublishingRajceOpenAlbumTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_;
-	PublishingRajceSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gint _tmp6_;
+	PublishingRajceLiveApiRequest* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* xml = NULL;
-	gchar* _tmp7_;
+	gchar* _tmp3_;
 #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = url;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceOpenAlbumTransaction*) 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 = (PublishingRajceOpenAlbumTransaction*) 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 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_live_api_request_new ("openAlbum");
+	_tmp0_ = publishing_rajce_live_api_request_new ("openAlbum");
 #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = session;
+	req = _tmp0_;
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+	_tmp1_ = publishing_rajce_session_get_usertoken (session);
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+	publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = albumID;
+	_g_free0 (_tmp2_);
 #line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamInt (req, "albumID", _tmp6_);
+	publishing_rajce_live_api_request_AddParamInt (req, "albumID", albumID);
 #line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+	_tmp3_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
 #line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp7_;
+	xml = _tmp3_;
 #line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10778,32 +11254,42 @@ PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_con
 	_publishing_rajce_live_api_request_unref0 (req);
 #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10778 "RajcePublishing.c"
+#line 11254 "RajcePublishing.c"
 }
 
 
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session, const gchar* url, gint albumID) {
+PublishingRajceOpenAlbumTransaction*
+publishing_rajce_open_album_transaction_new (PublishingRajceSession* session,
+                                             const gchar* url,
+                                             gint albumID)
+{
 #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_open_album_transaction_construct (PUBLISHING_RAJCE_TYPE_OPEN_ALBUM_TRANSACTION, session, url, albumID);
-#line 10785 "RajcePublishing.c"
+#line 11265 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_open_album_transaction_class_init (PublishingRajceOpenAlbumTransactionClass * klass) {
+static void
+publishing_rajce_open_album_transaction_class_init (PublishingRajceOpenAlbumTransactionClass * klass)
+{
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_open_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10792 "RajcePublishing.c"
+#line 11274 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_open_album_transaction_instance_init (PublishingRajceOpenAlbumTransaction * self) {
+static void
+publishing_rajce_open_album_transaction_instance_init (PublishingRajceOpenAlbumTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the open album interaction.
  */
-GType publishing_rajce_open_album_transaction_get_type (void) {
+GType
+publishing_rajce_open_album_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_open_album_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_open_album_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceOpenAlbumTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_open_album_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceOpenAlbumTransaction), 0, (GInstanceInitFunc) publishing_rajce_open_album_transaction_instance_init, NULL };
@@ -10815,58 +11301,50 @@ GType publishing_rajce_open_album_transaction_get_type (void) {
 }
 
 
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumUrlTransaction*
+publishing_rajce_get_album_url_transaction_construct (GType object_type,
+                                                      PublishingRajceSession* session,
+                                                      const gchar* url)
+{
 	PublishingRajceGetAlbumUrlTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_;
-	PublishingRajceSession* _tmp3_;
+	PublishingRajceLiveApiRequest* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingRajceSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
 	gchar* xml = NULL;
-	gchar* _tmp9_;
+	gchar* _tmp5_;
 #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = url;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceGetAlbumUrlTransaction*) 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 = (PublishingRajceGetAlbumUrlTransaction*) 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 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_live_api_request_new ("getAlbumUrl");
+	_tmp0_ = publishing_rajce_live_api_request_new ("getAlbumUrl");
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
+	req = _tmp0_;
 #line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = session;
+	_tmp1_ = publishing_rajce_session_get_usertoken (session);
 #line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+	_tmp2_ = _tmp1_;
 #line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+	publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
 #line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp2_);
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = session;
+	_tmp3_ = publishing_rajce_session_get_albumtoken (session);
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_);
-#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_);
+	publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp4_);
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp4_);
 #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+	_tmp5_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
 #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp9_;
+	xml = _tmp5_;
 #line 1477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10875,32 +11353,41 @@ PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transactio
 	_publishing_rajce_live_api_request_unref0 (req);
 #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10875 "RajcePublishing.c"
+#line 11353 "RajcePublishing.c"
 }
 
 
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumUrlTransaction*
+publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session,
+                                                const gchar* url)
+{
 #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_get_album_url_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUM_URL_TRANSACTION, session, url);
-#line 10882 "RajcePublishing.c"
+#line 11363 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_get_album_url_transaction_class_init (PublishingRajceGetAlbumUrlTransactionClass * klass) {
+static void
+publishing_rajce_get_album_url_transaction_class_init (PublishingRajceGetAlbumUrlTransactionClass * klass)
+{
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_get_album_url_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10889 "RajcePublishing.c"
+#line 11372 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_get_album_url_transaction_instance_init (PublishingRajceGetAlbumUrlTransaction * self) {
+static void
+publishing_rajce_get_album_url_transaction_instance_init (PublishingRajceGetAlbumUrlTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the close album interaction.
  */
-GType publishing_rajce_get_album_url_transaction_get_type (void) {
+GType
+publishing_rajce_get_album_url_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_get_album_url_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_get_album_url_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceGetAlbumUrlTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_get_album_url_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceGetAlbumUrlTransaction), 0, (GInstanceInitFunc) publishing_rajce_get_album_url_transaction_instance_init, NULL };
@@ -10912,58 +11399,50 @@ GType publishing_rajce_get_album_url_transaction_get_type (void) {
 }
 
 
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceCloseAlbumTransaction*
+publishing_rajce_close_album_transaction_construct (GType object_type,
+                                                    PublishingRajceSession* session,
+                                                    const gchar* url)
+{
 	PublishingRajceCloseAlbumTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_;
-	PublishingRajceSession* _tmp3_;
+	PublishingRajceLiveApiRequest* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingRajceSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
 	gchar* xml = NULL;
-	gchar* _tmp9_;
+	gchar* _tmp5_;
 #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = url;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceCloseAlbumTransaction*) 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 = (PublishingRajceCloseAlbumTransaction*) 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 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_live_api_request_new ("closeAlbum");
+	_tmp0_ = publishing_rajce_live_api_request_new ("closeAlbum");
 #line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = session;
+	req = _tmp0_;
 #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+	_tmp1_ = publishing_rajce_session_get_usertoken (session);
 #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+	publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
 #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = session;
+	_g_free0 (_tmp2_);
 #line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_);
+	_tmp3_ = publishing_rajce_session_get_albumtoken (session);
 #line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_);
+	publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp4_);
 #line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp4_);
 #line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+	_tmp5_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
 #line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp9_;
+	xml = _tmp5_;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10972,32 +11451,41 @@ PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_c
 	_publishing_rajce_live_api_request_unref0 (req);
 #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10972 "RajcePublishing.c"
+#line 11451 "RajcePublishing.c"
 }
 
 
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceCloseAlbumTransaction*
+publishing_rajce_close_album_transaction_new (PublishingRajceSession* session,
+                                              const gchar* url)
+{
 #line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_close_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CLOSE_ALBUM_TRANSACTION, session, url);
-#line 10979 "RajcePublishing.c"
+#line 11461 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_close_album_transaction_class_init (PublishingRajceCloseAlbumTransactionClass * klass) {
+static void
+publishing_rajce_close_album_transaction_class_init (PublishingRajceCloseAlbumTransactionClass * klass)
+{
 #line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_close_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10986 "RajcePublishing.c"
+#line 11470 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_close_album_transaction_instance_init (PublishingRajceCloseAlbumTransaction * self) {
+static void
+publishing_rajce_close_album_transaction_instance_init (PublishingRajceCloseAlbumTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the close album interaction.
  */
-GType publishing_rajce_close_album_transaction_get_type (void) {
+GType
+publishing_rajce_close_album_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_close_album_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_close_album_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceCloseAlbumTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_close_album_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceCloseAlbumTransaction), 0, (GInstanceInitFunc) publishing_rajce_close_album_transaction_instance_init, NULL };
@@ -11009,45 +11497,40 @@ GType publishing_rajce_close_album_transaction_get_type (void) {
 }
 
 
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetCategoriesTransaction*
+publishing_rajce_get_categories_transaction_construct (GType object_type,
+                                                       PublishingRajceSession* session,
+                                                       const gchar* url)
+{
 	PublishingRajceGetCategoriesTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_;
-	PublishingRajceSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
+	PublishingRajceLiveApiRequest* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* xml = NULL;
-	gchar* _tmp6_;
+	gchar* _tmp3_;
 #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = url;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceGetCategoriesTransaction*) 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 = (PublishingRajceGetCategoriesTransaction*) 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 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = publishing_rajce_live_api_request_new ("getCategories");
+	_tmp0_ = publishing_rajce_live_api_request_new ("getCategories");
 #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
-#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = session;
+	req = _tmp0_;
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+	_tmp1_ = publishing_rajce_session_get_usertoken (session);
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+	publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp2_);
 #line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+	_tmp3_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
 #line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp6_;
+	xml = _tmp3_;
 #line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -11056,32 +11539,41 @@ PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transac
 	_publishing_rajce_live_api_request_unref0 (req);
 #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 11056 "RajcePublishing.c"
+#line 11539 "RajcePublishing.c"
 }
 
 
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetCategoriesTransaction*
+publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session,
+                                                 const gchar* url)
+{
 #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_get_categories_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_CATEGORIES_TRANSACTION, session, url);
-#line 11063 "RajcePublishing.c"
+#line 11549 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_get_categories_transaction_class_init (PublishingRajceGetCategoriesTransactionClass * klass) {
+static void
+publishing_rajce_get_categories_transaction_class_init (PublishingRajceGetCategoriesTransactionClass * klass)
+{
 #line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_get_categories_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11070 "RajcePublishing.c"
+#line 11558 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_get_categories_transaction_instance_init (PublishingRajceGetCategoriesTransaction * self) {
+static void
+publishing_rajce_get_categories_transaction_instance_init (PublishingRajceGetCategoriesTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the get categories interaction.
  */
-GType publishing_rajce_get_categories_transaction_get_type (void) {
+GType
+publishing_rajce_get_categories_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_get_categories_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_get_categories_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceGetCategoriesTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_get_categories_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceGetCategoriesTransaction), 0, (GInstanceInitFunc) publishing_rajce_get_categories_transaction_instance_init, NULL };
@@ -11093,78 +11585,70 @@ GType publishing_rajce_get_categories_transaction_get_type (void) {
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	var = (g_free (var), NULL);
-#line 11096 "RajcePublishing.c"
+#line 11590 "RajcePublishing.c"
 }
 
 
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingRajceAddPhotoTransaction*
+publishing_rajce_add_photo_transaction_construct (GType object_type,
+                                                  PublishingRajceSession* session,
+                                                  const gchar* url,
+                                                  PublishingRajcePublishingParameters* parameters,
+                                                  SpitPublishingPublishable* publishable)
+{
 	PublishingRajceAddPhotoTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_;
-	SpitPublishingPublishable* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRajcePublishingParameters* _tmp3_;
-	PublishingRajcePublishingParameters* _tmp4_;
-	const gchar* _tmp5_ = NULL;
-	PublishingRajcePublishingParameters* _tmp6_;
-	gint* _tmp7_;
-	SpitPublishingPublishable* _tmp8_;
-	GFile* _tmp9_;
-	GFile* _tmp10_;
-	gchar* _tmp11_;
-	gchar* _tmp12_;
-	PublishingRajcePublishingParameters* _tmp13_;
-	const gchar* _tmp14_;
+	PublishingRajcePublishingParameters* _tmp0_;
+	const gchar* _tmp1_ = NULL;
+	gint* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
 	gchar* basename = NULL;
-	SpitPublishingPublishable* _tmp15_;
-	gchar* _tmp16_;
+	gchar* _tmp8_;
 	gchar* comment = NULL;
-	SpitPublishingPublishable* _tmp17_;
-	gchar* _tmp18_;
+	gchar* _tmp9_;
 	gchar* pubname = NULL;
-	SpitPublishingPublishable* _tmp19_;
-	gchar* _tmp20_;
+	gchar* _tmp10_;
 	gint width = 0;
-	PublishingRajceSession* _tmp21_;
-	gint _tmp22_;
 	gint height = 0;
-	PublishingRajceSession* _tmp23_;
-	gint _tmp24_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp25_;
-	PublishingRajceLiveApiRequest* _tmp26_;
-	PublishingRajceSession* _tmp27_;
-	gchar* _tmp28_;
-	gchar* _tmp29_;
+	PublishingRajceLiveApiRequest* _tmp11_;
+	PublishingRajceLiveApiRequest* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	PublishingRajceLiveApiRequest* _tmp15_;
+	gint _tmp16_;
+	PublishingRajceLiveApiRequest* _tmp17_;
+	gint _tmp18_;
+	PublishingRajceLiveApiRequest* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	PublishingRajceLiveApiRequest* _tmp22_;
+	const gchar* _tmp23_;
+	PublishingRajceLiveApiRequest* _tmp24_;
+	const gchar* _tmp25_;
+	const gchar* _tmp26_ = NULL;
+	const gchar* _tmp27_;
+	PublishingRajceLiveApiRequest* _tmp29_;
+	gchar* xml = NULL;
 	PublishingRajceLiveApiRequest* _tmp30_;
-	gint _tmp31_;
-	PublishingRajceLiveApiRequest* _tmp32_;
-	gint _tmp33_;
-	PublishingRajceLiveApiRequest* _tmp34_;
-	PublishingRajceSession* _tmp35_;
+	gchar* _tmp31_;
+	GHashTable* disposition_table = NULL;
+	GHashFunc _tmp32_;
+	GEqualFunc _tmp33_;
+	GHashTable* _tmp34_;
+	gchar* _tmp35_;
 	gchar* _tmp36_;
 	gchar* _tmp37_;
-	PublishingRajceLiveApiRequest* _tmp38_;
-	const gchar* _tmp39_;
-	PublishingRajceLiveApiRequest* _tmp40_;
-	const gchar* _tmp41_;
-	const gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_;
-	PublishingRajceLiveApiRequest* _tmp45_;
-	gchar* xml = NULL;
-	PublishingRajceLiveApiRequest* _tmp46_;
-	gchar* _tmp47_;
-	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp48_;
-	GEqualFunc _tmp49_;
-	GHashTable* _tmp50_;
-	gchar* _tmp51_;
-	gchar* _tmp52_;
-	gchar* _tmp53_;
-	const gchar* _tmp54_;
-	gchar* _tmp55_;
+	const gchar* _tmp38_;
+	gchar* _tmp39_;
 #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
 #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -11174,188 +11658,156 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const
 #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
 #line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = session;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = publishable;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = url;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = parameters;
+	self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, url);
 #line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = _publishing_rajce_publishing_parameters_ref0 (_tmp3_);
+	_tmp0_ = _publishing_rajce_publishing_parameters_ref0 (parameters);
 #line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
 #line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->parameters = _tmp4_;
+	self->priv->parameters = _tmp0_;
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = parameters;
+	_tmp2_ = parameters->album_id;
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = _tmp6_->album_id;
+	if ((*_tmp2_) > 0) {
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if ((*_tmp7_) > 0) {
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp5_ = "";
-#line 11197 "RajcePublishing.c"
+		_tmp1_ = "";
+#line 11671 "RajcePublishing.c"
 	} else {
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp5_ = " new";
-#line 11201 "RajcePublishing.c"
+		_tmp1_ = " new";
+#line 11675 "RajcePublishing.c"
 	}
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = publishable;
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = spit_publishing_publishable_get_serialized_file (_tmp8_);
+	_tmp3_ = spit_publishing_publishable_get_serialized_file (publishable);
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp11_ = g_file_get_basename (_tmp10_);
+	_tmp4_ = _tmp3_;
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp12_ = _tmp11_;
+	_tmp5_ = g_file_get_basename (_tmp4_);
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp13_ = parameters;
+	_tmp6_ = _tmp5_;
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp14_ = _tmp13_->album_name;
+	_tmp7_ = parameters->album_name;
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:1524: RajcePlugin: Uploading photo %s to%s album " \
-"%s", _tmp12_, _tmp5_, _tmp14_);
+"%s", _tmp6_, _tmp1_, _tmp7_);
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp6_);
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (_tmp10_);
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp15_ = publishable;
+	_g_object_unref0 (_tmp4_);
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp16_ = spit_publishing_publishable_get_param_string (_tmp15_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+	_tmp8_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	basename = _tmp16_;
+	basename = _tmp8_;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp17_ = publishable;
+	_tmp9_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp18_ = spit_publishing_publishable_get_param_string (_tmp17_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	comment = _tmp18_;
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp19_ = publishable;
+	comment = _tmp9_;
 #line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp20_ = spit_publishing_publishable_get_publishing_name (_tmp19_);
+	_tmp10_ = spit_publishing_publishable_get_publishing_name (publishable);
 #line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	pubname = _tmp20_;
+	pubname = _tmp10_;
 #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp21_ = session;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp22_ = publishing_rajce_session_get_maxsize (_tmp21_);
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	width = _tmp22_;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp23_ = session;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp24_ = publishing_rajce_session_get_maxsize (_tmp23_);
+	width = publishing_rajce_session_get_maxsize (session);
 #line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	height = _tmp24_;
+	height = publishing_rajce_session_get_maxsize (session);
 #line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp25_ = publishing_rajce_live_api_request_new ("addPhoto");
+	_tmp11_ = publishing_rajce_live_api_request_new ("addPhoto");
 #line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp25_;
+	req = _tmp11_;
 #line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp26_ = req;
+	_tmp12_ = req;
 #line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp27_ = session;
+	_tmp13_ = publishing_rajce_session_get_usertoken (session);
 #line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp28_ = publishing_rajce_session_get_usertoken (_tmp27_);
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp29_ = _tmp28_;
+	_tmp14_ = _tmp13_;
 #line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp26_, "token", _tmp29_);
+	publishing_rajce_live_api_request_AddParam (_tmp12_, "token", _tmp14_);
 #line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp29_);
+	_g_free0 (_tmp14_);
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp30_ = req;
+	_tmp15_ = req;
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp31_ = width;
+	_tmp16_ = width;
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamInt (_tmp30_, "width", _tmp31_);
+	publishing_rajce_live_api_request_AddParamInt (_tmp15_, "width", _tmp16_);
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp32_ = req;
+	_tmp17_ = req;
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp33_ = height;
+	_tmp18_ = height;
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamInt (_tmp32_, "height", _tmp33_);
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp34_ = req;
+	publishing_rajce_live_api_request_AddParamInt (_tmp17_, "height", _tmp18_);
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp35_ = session;
+	_tmp19_ = req;
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp36_ = publishing_rajce_session_get_albumtoken (_tmp35_);
+	_tmp20_ = publishing_rajce_session_get_albumtoken (session);
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp37_ = _tmp36_;
+	_tmp21_ = _tmp20_;
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp34_, "albumToken", _tmp37_);
+	publishing_rajce_live_api_request_AddParam (_tmp19_, "albumToken", _tmp21_);
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp37_);
+	_g_free0 (_tmp21_);
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp38_ = req;
+	_tmp22_ = req;
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp39_ = pubname;
+	_tmp23_ = pubname;
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp38_, "photoName", _tmp39_);
+	publishing_rajce_live_api_request_AddParam (_tmp22_, "photoName", _tmp23_);
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp40_ = req;
+	_tmp24_ = req;
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp41_ = basename;
+	_tmp25_ = basename;
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp40_, "fullFileName", _tmp41_);
+	publishing_rajce_live_api_request_AddParam (_tmp24_, "fullFileName", _tmp25_);
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp43_ = comment;
+	_tmp27_ = comment;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if (_tmp43_ != NULL) {
-#line 11309 "RajcePublishing.c"
-		const gchar* _tmp44_;
+	if (_tmp27_ != NULL) {
+#line 11761 "RajcePublishing.c"
+		const gchar* _tmp28_;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp44_ = comment;
+		_tmp28_ = comment;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp42_ = _tmp44_;
-#line 11315 "RajcePublishing.c"
+		_tmp26_ = _tmp28_;
+#line 11767 "RajcePublishing.c"
 	} else {
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp42_ = "";
-#line 11319 "RajcePublishing.c"
+		_tmp26_ = "";
+#line 11771 "RajcePublishing.c"
 	}
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp45_ = req;
+	_tmp29_ = req;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp45_, "description", _tmp42_);
+	publishing_rajce_live_api_request_AddParam (_tmp29_, "description", _tmp26_);
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp46_ = req;
+	_tmp30_ = req;
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp47_ = publishing_rajce_live_api_request_Params2XmlString (_tmp46_, FALSE);
+	_tmp31_ = publishing_rajce_live_api_request_Params2XmlString (_tmp30_, FALSE);
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp47_;
+	xml = _tmp31_;
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp48_ = g_str_hash;
+	_tmp32_ = g_str_hash;
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp49_ = g_str_equal;
+	_tmp33_ = g_str_equal;
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp50_ = g_hash_table_new_full (_tmp48_, _tmp49_, _g_free0_, _g_free0_);
+	_tmp34_ = g_hash_table_new_full (_tmp32_, _tmp33_, _g_free0_, _g_free0_);
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	disposition_table = _tmp50_;
+	disposition_table = _tmp34_;
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp51_ = g_strdup ("name");
+	_tmp35_ = g_strdup ("name");
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp52_ = g_strdup ("photo");
+	_tmp36_ = g_strdup ("photo");
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp51_, _tmp52_);
+	g_hash_table_insert (disposition_table, _tmp35_, _tmp36_);
 #line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp53_ = g_strdup ("filename");
+	_tmp37_ = g_strdup ("filename");
 #line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp54_ = basename;
+	_tmp38_ = basename;
 #line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp55_ = soup_uri_encode (_tmp54_, NULL);
+	_tmp39_ = soup_uri_encode (_tmp38_, NULL);
 #line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp53_, _tmp55_);
+	g_hash_table_insert (disposition_table, _tmp37_, _tmp39_);
 #line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table);
 #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -11372,38 +11824,49 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const
 	_g_free0 (basename);
 #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 11371 "RajcePublishing.c"
+#line 11823 "RajcePublishing.c"
 }
 
 
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingRajceAddPhotoTransaction*
+publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session,
+                                            const gchar* url,
+                                            PublishingRajcePublishingParameters* parameters,
+                                            SpitPublishingPublishable* publishable)
+{
 #line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_add_photo_transaction_construct (PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, session, url, parameters, publishable);
-#line 11378 "RajcePublishing.c"
+#line 11835 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_add_photo_transaction_class_init (PublishingRajceAddPhotoTransactionClass * klass) {
+static void
+publishing_rajce_add_photo_transaction_class_init (PublishingRajceAddPhotoTransactionClass * klass)
+{
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_add_photo_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rajce_add_photo_transaction_finalize;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRajceAddPhotoTransactionPrivate));
-#line 11389 "RajcePublishing.c"
+#line 11848 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_add_photo_transaction_instance_init (PublishingRajceAddPhotoTransaction * self) {
+static void
+publishing_rajce_add_photo_transaction_instance_init (PublishingRajceAddPhotoTransaction * self)
+{
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_GET_PRIVATE (self);
 #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->parameters = NULL;
-#line 11398 "RajcePublishing.c"
+#line 11859 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingRajceAddPhotoTransaction * self;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, PublishingRajceAddPhotoTransaction);
@@ -11411,14 +11874,16 @@ static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSuppo
 	_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rajce_add_photo_transaction_parent_class)->finalize (obj);
-#line 11410 "RajcePublishing.c"
+#line 11873 "RajcePublishing.c"
 }
 
 
 /**
  * Transaction used to implement the upload photo.
  */
-GType publishing_rajce_add_photo_transaction_get_type (void) {
+GType
+publishing_rajce_add_photo_transaction_get_type (void)
+{
 	static volatile gsize publishing_rajce_add_photo_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rajce_add_photo_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceAddPhotoTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_add_photo_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceAddPhotoTransaction), 0, (GInstanceInitFunc) publishing_rajce_add_photo_transaction_instance_init, NULL };
@@ -11430,7 +11895,11 @@ GType publishing_rajce_add_photo_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) {
@@ -11442,7 +11911,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-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
deleted file mode 100644
index 8749112..0000000
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ /dev/null
@@ -1,8447 +0,0 @@
-/* TumblrPublishing.c generated by valac 0.36.6, 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 <gtk/gtk.h>
-#include <json-glib/json-glib.h>
-#include <gee.h>
-#include <float.h>
-#include <math.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;
-#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_SESSION (publishing_tumblr_tumblr_publisher_session_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherSession PublishingTumblrTumblrPublisherSession;
-typedef struct _PublishingTumblrTumblrPublisherSessionClass PublishingTumblrTumblrPublisherSessionClass;
-
-#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;
-#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_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_TYPE_MODE (publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type ())
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE (publishing_tumblr_tumblr_publisher_authentication_pane_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPaneClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPaneClass))
-
-typedef struct _PublishingTumblrTumblrPublisherAuthenticationPane PublishingTumblrTumblrPublisherAuthenticationPane;
-typedef struct _PublishingTumblrTumblrPublisherAuthenticationPaneClass PublishingTumblrTumblrPublisherAuthenticationPaneClass;
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION (publishing_tumblr_tumblr_publisher_transaction_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransactionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransactionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherTransaction PublishingTumblrTumblrPublisherTransaction;
-typedef struct _PublishingTumblrTumblrPublisherTransactionClass PublishingTumblrTumblrPublisherTransactionClass;
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherAccessTokenFetchTransaction))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransaction PublishingTumblrTumblrPublisherAccessTokenFetchTransaction;
-typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass;
-#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-
-#define PUBLISHING_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 _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 _PublishingTumblrTumblrPublisherAuthenticationPanePrivate PublishingTumblrTumblrPublisherAuthenticationPanePrivate;
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL,
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL
-};
-static guint publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
-typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate;
-#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_LAST_SIGNAL
-};
-static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
-typedef struct _PublishingTumblrTumblrPublisherTransactionPrivate PublishingTumblrTumblrPublisherTransactionPrivate;
-typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate;
-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;
-typedef struct _PublishingTumblrTumblrPublisherSessionPrivate PublishingTumblrTumblrPublisherSessionPrivate;
-#define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#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;
-	PublishingTumblrTumblrPublisherSession* session;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane;
-	PublishingTumblrSizeEntry** sizes;
-	gint sizes_length1;
-	gint _sizes_size_;
-	PublishingTumblrBlogEntry** blogs;
-	gint blogs_length1;
-	gint _blogs_size_;
-	gchar* username;
-};
-
-typedef enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO,
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER
-} PublishingTumblrTumblrPublisherAuthenticationPaneMode;
-
-struct _PublishingTumblrTumblrPublisherAuthenticationPane {
-	GObject parent_instance;
-	PublishingTumblrTumblrPublisherAuthenticationPanePrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherAuthenticationPaneClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherAuthenticationPanePrivate {
-	GtkBox* pane_widget;
-	GtkBuilder* builder;
-	GtkEntry* username_entry;
-	GtkEntry* password_entry;
-	GtkButton* login_button;
-};
-
-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 _PublishingTumblrTumblrPublisherTransaction {
-	PublishingRESTSupportTransaction parent_instance;
-	PublishingTumblrTumblrPublisherTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherTransactionClass {
-	PublishingRESTSupportTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransaction {
-	PublishingTumblrTumblrPublisherTransaction parent_instance;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass {
-	PublishingTumblrTumblrPublisherTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUserInfoFetchTransaction {
-	PublishingTumblrTumblrPublisherTransaction parent_instance;
-	PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass {
-	PublishingTumblrTumblrPublisherTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUploadTransaction {
-	PublishingRESTSupportUploadTransaction parent_instance;
-	PublishingTumblrTumblrPublisherUploadTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherUploadTransactionClass {
-	PublishingRESTSupportUploadTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUploadTransactionPrivate {
-	PublishingTumblrTumblrPublisherSession* session;
-	PublishingRESTSupportArgument** auth_header_fields;
-	gint auth_header_fields_length1;
-	gint _auth_header_fields_size_;
-};
-
-struct _PublishingTumblrTumblrPublisherUploader {
-	PublishingRESTSupportBatchUploader parent_instance;
-	PublishingTumblrTumblrPublisherUploaderPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherUploaderClass {
-	PublishingRESTSupportBatchUploaderClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUploaderPrivate {
-	gchar* blog_url;
-};
-
-struct _PublishingTumblrTumblrPublisherSession {
-	PublishingRESTSupportSession parent_instance;
-	PublishingTumblrTumblrPublisherSessionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherSessionClass {
-	PublishingRESTSupportSessionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherSessionPrivate {
-	gchar* access_phase_token;
-	gchar* access_phase_token_secret;
-};
-
-
-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_authentication_pane_parent_class = NULL;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = NULL;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL;
-static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = 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_transaction_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = 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 gpointer publishing_tumblr_tumblr_publisher_session_parent_class = NULL;
-static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
-
-GType tumblr_service_get_type (void) G_GNUC_CONST;
-enum  {
-	TUMBLR_SERVICE_DUMMY_PROPERTY
-};
-#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_dup6 (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_API_KEY "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k"
-#define PUBLISHING_TUMBLR_API_SECRET "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi"
-#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;
-enum  {
-	PUBLISHING_TUMBLR_BLOG_ENTRY_DUMMY_PROPERTY
-};
-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;
-enum  {
-	PUBLISHING_TUMBLR_SIZE_ENTRY_DUMMY_PROPERTY
-};
-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_session_get_type (void) G_GNUC_CONST;
-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))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_DUMMY_PROPERTY
-};
-static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self);
-static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
-static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1);
-static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1);
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void);
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type);
-static void publishing_tumblr_tumblr_publisher_invalidate_persistent_session (PublishingTumblrTumblrPublisher* self);
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self, const gchar* token);
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self, const gchar* token_secret);
-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);
-static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (PublishingTumblrTumblrPublisher* self);
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self);
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self);
-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);
-GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (PublishingTumblrTumblrPublisher* self, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode);
-GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) G_GNUC_CONST;
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode);
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode);
-static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password);
-static void _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login (PublishingTumblrTumblrPublisherAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self);
-GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password);
-GType publishing_tumblr_tumblr_publisher_transaction_get_type (void) G_GNUC_CONST;
-GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password);
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password);
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_tumblr_tumblr_publisher_on_auth_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_auth_request (PublishingTumblrTumblrPublisher* self, const gchar* response);
-void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret);
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (PublishingTumblrTumblrPublisherSession* self);
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (PublishingTumblrTumblrPublisherSession* self);
-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 (PublishingTumblrTumblrPublisherSession* session);
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* 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_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value);
-void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self);
-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 (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url);
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingTumblrTumblrPublisherSession* 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);
-void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret);
-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_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPanePrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj);
-#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))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry** self, int length);
-static PublishingTumblrBlogEntry** _vala_array_dup8 (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);
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method);
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method);
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTumblrTumblrPublisherSession* self);
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (PublishingTumblrTumblrPublisherSession* self);
-static void publishing_tumblr_tumblr_publisher_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumblrTumblrPublisherSession* self, PublishingRESTSupportTransaction* txn);
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) G_GNUC_CONST;
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionPrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1);
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
-void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value);
-static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
-PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1);
-static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length);
-gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self);
-static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderPrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionPrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_DUMMY_PROPERTY
-};
-static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
-static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * 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);
-static gint _vala_array_length (gpointer array);
-
-
-TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory) {
-	TumblrService * self = NULL;
-	GdkPixbuf** _tmp0_;
-	gint _tmp0__length1;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (TumblrService*) g_object_new (object_type, NULL);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = tumblr_service_icon_pixbuf_set;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = tumblr_service_icon_pixbuf_set_length1;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ == NULL) {
-#line 660 "TumblrPublishing.c"
-		gint _tmp1_;
-		GdkPixbuf** _tmp2_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" TUMBLR_SERVICE_ICON_FILENAME, &_tmp1_);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tumblr_service_icon_pixbuf_set = _tmp2_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tumblr_service_icon_pixbuf_set_length1 = _tmp1_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tumblr_service_icon_pixbuf_set_size_ = tumblr_service_icon_pixbuf_set_length1;
-#line 673 "TumblrPublishing.c"
-	}
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 677 "TumblrPublishing.c"
-}
-
-
-TumblrService* tumblr_service_new (GFile* resource_directory) {
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return tumblr_service_construct (TYPE_TUMBLR_SERVICE, resource_directory);
-#line 684 "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;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp2_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 706 "TumblrPublishing.c"
-}
-
-
-static const gchar* tumblr_service_real_get_id (SpitPluggable* base) {
-	TumblrService * self;
-	const gchar* result = NULL;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = "org.yorba.shotwell.publishing.tumblr";
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 719 "TumblrPublishing.c"
-}
-
-
-static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base) {
-	TumblrService * self;
-	const gchar* result = NULL;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = "Tumblr";
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 732 "TumblrPublishing.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 739 "TumblrPublishing.c"
-}
-
-
-static GdkPixbuf** _vala_array_dup6 (GdkPixbuf** self, int length) {
-	GdkPixbuf** result;
-	int i;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (GdkPixbuf*, length + 1);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 750 "TumblrPublishing.c"
-		GdkPixbuf* _tmp0_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _g_object_ref0 (self[i]);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 756 "TumblrPublishing.c"
-	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 760 "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 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (info != NULL);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("Jeroen Arnoldus");
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).authors);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).authors = _tmp0_;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_ ("Copyright 2012 BJA Electronics"));
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).copyright);
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).copyright = _tmp1_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).translators);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).translators = _tmp2_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_VERSION);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).version);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).version = _tmp3_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).website_name);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).website_name = _tmp4_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).website_url);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).website_url = _tmp5_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).is_license_wordwrapped = FALSE;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_LICENSE);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).license);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).license = _tmp6_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = tumblr_service_icon_pixbuf_set;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = tumblr_service_icon_pixbuf_set_length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup6 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8__length1 = _tmp7__length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons = _tmp8_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons_length1 = _tmp8__length1;
-#line 839 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_real_activation (SpitPluggable* base, gboolean enabled) {
-	TumblrService * self;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 847 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
-	TumblrService * self;
-	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingTumblrTumblrPublisher* _tmp1_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = host;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 868 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base) {
-	TumblrService * self;
-	SpitPublishingPublisherMediaType result = 0;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 881 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_class_init (TumblrServiceClass * klass) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	tumblr_service_parent_class = g_type_class_peek_parent (klass);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = tumblr_service_finalize;
-#line 890 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	tumblr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) tumblr_service_real_get_pluggable_interface;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_id = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_id;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_pluggable_name;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) tumblr_service_real_get_info;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation;
-#line 907 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	tumblr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media;
-#line 918 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_instance_init (TumblrService * self) {
-}
-
-
-static void tumblr_service_finalize (GObject * obj) {
-	TumblrService * self;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (tumblr_service_parent_class)->finalize (obj);
-#line 932 "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;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (creator_blog != NULL, NULL);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (creator_url != NULL, NULL);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrBlogEntry*) g_type_create_instance (object_type);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = creator_blog;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->blog);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->blog = _tmp1_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = creator_url;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->url);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->url = _tmp3_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 982 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url) {
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_blog_entry_construct (PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, creator_blog, creator_url);
-#line 989 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_blog_entry_init (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	value->data[0].v_pointer = NULL;
-#line 996 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_blog_entry_free_value (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_unref (value->data[0].v_pointer);
-#line 1005 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (src_value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (src_value->data[0].v_pointer);
-#line 1015 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1019 "TumblrPublishing.c"
-	}
-}
-
-
-static gpointer publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1027 "TumblrPublishing.c"
-}
-
-
-static gchar* publishing_tumblr_value_blog_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (collect_values[0].v_pointer) {
-#line 1034 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry * object;
-		object = collect_values[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1041 "TumblrPublishing.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 1045 "TumblrPublishing.c"
-		}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (object);
-#line 1049 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1053 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return NULL;
-#line 1057 "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 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!object_p) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1068 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = NULL;
-#line 1074 "TumblrPublishing.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = value->data[0].v_pointer;
-#line 1078 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 1082 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return NULL;
-#line 1086 "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 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return G_PARAM_SPEC (spec);
-#line 1100 "TumblrPublishing.c"
-}
-
-
-gpointer publishing_tumblr_value_get_blog_entry (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1109 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry * old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 1129 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1133 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_unref (old);
-#line 1139 "TumblrPublishing.c"
-	}
-}
-
-
-void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry * old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 1158 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1162 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_unref (old);
-#line 1168 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryClass * klass) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_blog_entry_parent_class = g_type_class_peek_parent (klass);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingTumblrBlogEntryClass *) klass)->finalize = publishing_tumblr_blog_entry_finalize;
-#line 1178 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->ref_count = 1;
-#line 1185 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj) {
-	PublishingTumblrBlogEntry * self;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_destroy (self);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->blog);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->url);
-#line 1199 "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 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return instance;
-#line 1224 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_blog_entry_unref (gpointer instance) {
-	PublishingTumblrBlogEntry * self;
-	self = instance;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS (self)->finalize (self);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 1237 "TumblrPublishing.c"
-	}
-}
-
-
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) {
-	PublishingTumblrSizeEntry* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint _tmp2_;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrSizeEntry*) g_type_create_instance (object_type);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = creator_title;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->title);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->title = _tmp1_;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = creator_size;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->size = _tmp2_;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 1265 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size) {
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_size_entry_construct (PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 1272 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_size_entry_init (GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	value->data[0].v_pointer = NULL;
-#line 1279 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_size_entry_free_value (GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (value->data[0].v_pointer) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_unref (value->data[0].v_pointer);
-#line 1288 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (src_value->data[0].v_pointer) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = publishing_tumblr_size_entry_ref (src_value->data[0].v_pointer);
-#line 1298 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1302 "TumblrPublishing.c"
-	}
-}
-
-
-static gpointer publishing_tumblr_value_size_entry_peek_pointer (const GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1310 "TumblrPublishing.c"
-}
-
-
-static gchar* publishing_tumblr_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (collect_values[0].v_pointer) {
-#line 1317 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry * object;
-		object = collect_values[0].v_pointer;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1324 "TumblrPublishing.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 1328 "TumblrPublishing.c"
-		}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = publishing_tumblr_size_entry_ref (object);
-#line 1332 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1336 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return NULL;
-#line 1340 "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 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!object_p) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1351 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!value->data[0].v_pointer) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = NULL;
-#line 1357 "TumblrPublishing.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = value->data[0].v_pointer;
-#line 1361 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1365 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return G_PARAM_SPEC (spec);
-#line 1383 "TumblrPublishing.c"
-}
-
-
-gpointer publishing_tumblr_value_get_size_entry (const GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1392 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry * old;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1412 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1416 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_unref (old);
-#line 1422 "TumblrPublishing.c"
-	}
-}
-
-
-void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry * old;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 1441 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1445 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_unref (old);
-#line 1451 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryClass * klass) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_size_entry_parent_class = g_type_class_peek_parent (klass);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingTumblrSizeEntryClass *) klass)->finalize = publishing_tumblr_size_entry_finalize;
-#line 1461 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->ref_count = 1;
-#line 1468 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj) {
-	PublishingTumblrSizeEntry * self;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_destroy (self);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->title);
-#line 1480 "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 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return instance;
-#line 1505 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_size_entry_unref (gpointer instance) {
-	PublishingTumblrSizeEntry * self;
-	self = instance;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 1518 "TumblrPublishing.c"
-	}
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_session_authenticated ((PublishingTumblrTumblrPublisher*) self);
-#line 1526 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1537 "TumblrPublishing.c"
-	}
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 1543 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1554 "TumblrPublishing.c"
-	}
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 1560 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1571 "TumblrPublishing.c"
-	}
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 1577 "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 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_new0 (PublishingTumblrSizeEntry*, 0 + 1);
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result_ = _tmp0_;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result__length1 = 0;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	__result__size_ = _result__length1;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _result_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = _result__length1;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_tumblr_size_entry_new (_ ("500 × 375 pixels"), 500);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp2_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _result_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3__length1 = _result__length1;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_size_entry_new (_ ("1024 × 768 pixels"), 1024);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _result_;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5__length1 = _result__length1;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_size_entry_new (_ ("1280 × 853 pixels"), 1280);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _result_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = _result__length1;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (result_length1) {
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*result_length1 = _tmp7__length1;
-#line 1640 "TumblrPublishing.c"
-	}
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp7_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1646 "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 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_new0 (PublishingTumblrBlogEntry*, 0 + 1);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result_ = _tmp0_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result__length1 = 0;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	__result__size_ = _result__length1;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _result_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = _result__length1;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (result_length1) {
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*result_length1 = _tmp1__length1;
-#line 1676 "TumblrPublishing.c"
-	}
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1682 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
-	PublishingTumblrTumblrPublisher * self = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingService* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	PublishingTumblrTumblrPublisherSession* _tmp4_;
-	gint _tmp5_;
-	PublishingTumblrSizeEntry** _tmp6_;
-	gint _tmp7_;
-	PublishingTumblrBlogEntry** _tmp8_;
-	PublishingTumblrTumblrPublisherSession* _tmp9_;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisher*) g_object_new (object_type, NULL);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:125: TumblrPublisher instantiated.");
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = service;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->service);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->service = _tmp1_;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = host;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->host);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->host = _tmp3_;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_tumblr_publisher_session_new ();
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->session = _tmp4_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_tumblr_publisher_create_sizes (self, &_tmp5_);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = _tmp6_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = _tmp5_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = publishing_tumblr_tumblr_publisher_create_blogs (self, &_tmp7_);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = _tmp8_;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = _tmp7_;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = self->priv->session;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 1754 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_construct (PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, service, host);
-#line 1761 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_invalidate_persistent_session (PublishingTumblrTumblrPublisher* self) {
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (self, "");
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (self, "");
-#line 1772 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingService* _tmp1_;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->service;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1791 "TumblrPublishing.c"
-}
-
-
-SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1809 "TumblrPublishing.c"
-}
-
-
-static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->running;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp0_;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1825 "TumblrPublishing.c"
-}
-
-
-static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (PublishingTumblrTumblrPublisher* self) {
-	gboolean result = FALSE;
-	gchar* access_phase_token = NULL;
-	gchar* _tmp0_;
-	gchar* access_phase_token_secret = NULL;
-	gchar* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_;
-	gboolean valid = FALSE;
-	gboolean _tmp5_;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), FALSE);
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (self);
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	access_phase_token = _tmp0_;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (self);
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	access_phase_token_secret = _tmp1_;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = access_phase_token;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp3_ != NULL) {
-#line 1853 "TumblrPublishing.c"
-		const gchar* _tmp4_;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = access_phase_token_secret;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = _tmp4_ != NULL;
-#line 1859 "TumblrPublishing.c"
-	} else {
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = FALSE;
-#line 1863 "TumblrPublishing.c"
-	}
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	valid = _tmp2_;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = valid;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp5_) {
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:163: existing Tumblr session found in configurat" \
-"ion database; using it.");
-#line 1873 "TumblrPublishing.c"
-	} else {
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:165: no persisted Tumblr session exists.");
-#line 1877 "TumblrPublishing.c"
-	}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = valid;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (access_phase_token_secret);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (access_phase_token);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1887 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	gchar* _tmp1_;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", NULL);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1905 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = token;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", _tmp1_);
-#line 1920 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	gchar* _tmp1_;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token_secret", NULL);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1938 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self, const gchar* token_secret) {
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = token_secret;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token_secret", _tmp1_);
-#line 1953 "TumblrPublishing.c"
-}
-
-
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self) {
-	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1971 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size) {
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = size;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 1986 "TumblrPublishing.c"
-}
-
-
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self) {
-	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", 0);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 2004 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog) {
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = blog;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", _tmp1_);
-#line 2019 "TumblrPublishing.c"
-}
-
-
-/**
-     * Action that shows the authentication pane.
-     *
-     * This action method shows the authentication pane. It is shown at the
-     * very beginning of the interaction when no persistent parameters are found
-     * or after a failed login attempt using persisted parameters. It can be
-     * given a mode flag to specify whether it should be displayed in initial
-     * mode or in any of the error modes that it supports.
-     *
-     * @param mode the mode for the authentication pane
-     */
-static void _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login (PublishingTumblrTumblrPublisherAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked ((PublishingTumblrTumblrPublisher*) self, user, password);
-#line 2037 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (PublishingTumblrTumblrPublisher* self, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingTumblrTumblrPublisherAuthenticationPane* authentication_pane = NULL;
-	PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp1_;
-	PublishingTumblrTumblrPublisherAuthenticationPane* _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
-	GtkWidget* _tmp5_;
-	GtkWidget* _tmp6_;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:219: ACTION: installing authentication pane");
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = mode;
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_tumblr_tumblr_publisher_authentication_pane_new (self, _tmp1_);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	authentication_pane = _tmp2_;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login, self, 0);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->host;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.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);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->host;
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (authentication_pane);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (_tmp6_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (authentication_pane);
-#line 2082 "TumblrPublishing.c"
-}
-
-
-/**
-     * Event triggered when the login button in the authentication panel is
-     * clicked.
-     *
-     * This event is triggered when the login button in the authentication
-     * panel is clicked. It then triggers a network login interaction.
-     *
-     * @param username the name of the Tumblr user as entered in the dialog
-     * @param password the password of the Tumblr as entered in the dialog
-     */
-static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) {
-	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (password != NULL);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:240: EVENT: on_authentication_pane_login_clicked");
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->running;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2114 "TumblrPublishing.c"
-	}
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = username;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = password;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_network_login (self, _tmp1_, _tmp2_);
-#line 2122 "TumblrPublishing.c"
-}
-
-
-/**
-     * Action to perform a network login to a Tumblr blog.
-     *
-     * This action performs a network login a Tumblr blog specified the given user name and password as credentials.
-     *
-     * @param username the name of the Tumblr user used to login
-     * @param password the password of the Tumblr user used to login
-     */
-static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 2137 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_auth_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2144 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) {
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* _tmp5_;
-	GError * _inner_error_ = NULL;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (password != NULL);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:256: ACTION: logging in");
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->session;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = username;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = password;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (_tmp2_, _tmp3_, _tmp4_);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	txn = _tmp5_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2187 "TumblrPublishing.c"
-	{
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2195 "TumblrPublishing.c"
-				goto __catch32_spit_publishing_publishing_error;
-			}
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 2206 "TumblrPublishing.c"
-		}
-	}
-	goto __finally32;
-	__catch32_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp6_;
-		GError* _tmp7_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		err = _inner_error_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = self->priv->host;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = err;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (err);
-#line 2227 "TumblrPublishing.c"
-	}
-	__finally32:
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2240 "TumblrPublishing.c"
-	}
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 2244 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingRESTSupportTransaction* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2282 "TumblrPublishing.c"
-	}
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = txn;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:280: EVENT: OAuth authentication request transac" \
-"tion completed; response = '%s'", _tmp7_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = txn;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (self, _tmp10_);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 2304 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	SpitPublishingPluginHost* _tmp5_;
-	GError* _tmp6_;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = 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-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2338 "TumblrPublishing.c"
-	}
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:294: EVENT: OAuth authentication request transac" \
-"tion caused a network error");
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = self->priv->host;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = err;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2348 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_;
-	gchar* oauth_token = NULL;
-	gchar* oauth_token_secret = NULL;
-	gchar** key_value_pairs = NULL;
-	const gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint key_value_pairs_length1;
-	gint _key_value_pairs_size_;
-	gchar** _tmp4_;
-	gint _tmp4__length1;
-	gboolean _tmp24_ = FALSE;
-	const gchar* _tmp25_;
-	PublishingTumblrTumblrPublisherSession* _tmp31_;
-	const gchar* _tmp32_;
-	const gchar* _tmp33_;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = response;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:300: ACTION: parsing authorization request respo" \
-"nse '%s' into token and secret", _tmp0_);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	oauth_token = NULL;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	oauth_token_secret = NULL;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = response;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_ = g_strsplit (_tmp1_, "&", 0);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	key_value_pairs = _tmp3_;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	key_value_pairs_length1 = _vala_array_length (_tmp2_);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_key_value_pairs_size_ = key_value_pairs_length1;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = key_value_pairs;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = key_value_pairs_length1;
-#line 2395 "TumblrPublishing.c"
-	{
-		gchar** pair_collection = NULL;
-		gint pair_collection_length1 = 0;
-		gint _pair_collection_size_ = 0;
-		gint pair_it = 0;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		pair_collection = _tmp4_;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		pair_collection_length1 = _tmp4__length1;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		for (pair_it = 0; pair_it < _tmp4__length1; pair_it = pair_it + 1) {
-#line 2407 "TumblrPublishing.c"
-			gchar* _tmp5_;
-			gchar* pair = NULL;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp5_ = g_strdup (pair_collection[pair_it]);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			pair = _tmp5_;
-#line 2414 "TumblrPublishing.c"
-			{
-				gchar** split_pair = NULL;
-				const gchar* _tmp6_;
-				gchar** _tmp7_;
-				gchar** _tmp8_;
-				gint split_pair_length1;
-				gint _split_pair_size_;
-				gchar** _tmp9_;
-				gint _tmp9__length1;
-				gchar** _tmp14_;
-				gint _tmp14__length1;
-				const gchar* _tmp15_;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp6_ = pair;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp8_ = _tmp7_ = g_strsplit (_tmp6_, "=", 0);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				split_pair = _tmp8_;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				split_pair_length1 = _vala_array_length (_tmp7_);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_split_pair_size_ = split_pair_length1;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp9_ = split_pair;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp9__length1 = split_pair_length1;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp9__length1 != 2) {
-#line 2443 "TumblrPublishing.c"
-					SpitPublishingPluginHost* _tmp10_;
-					const gchar* _tmp11_;
-					GError* _tmp12_;
-					GError* _tmp13_;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp10_ = self->priv->host;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11_ = response;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp12_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _ ("“%s” isn’t a valid response to an OAuth authentication request"), _tmp11_);
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp13_ = _tmp12_;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_);
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_error_free0 (_tmp13_);
-#line 2460 "TumblrPublishing.c"
-				}
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = split_pair;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14__length1 = split_pair_length1;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = _tmp14_[0];
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (g_strcmp0 (_tmp15_, "oauth_token") == 0) {
-#line 2470 "TumblrPublishing.c"
-					gchar** _tmp16_;
-					gint _tmp16__length1;
-					const gchar* _tmp17_;
-					gchar* _tmp18_;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp16_ = split_pair;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp16__length1 = split_pair_length1;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17_ = _tmp16_[1];
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp18_ = g_strdup (_tmp17_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (oauth_token);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					oauth_token = _tmp18_;
-#line 2487 "TumblrPublishing.c"
-				} else {
-					gchar** _tmp19_;
-					gint _tmp19__length1;
-					const gchar* _tmp20_;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19_ = split_pair;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19__length1 = split_pair_length1;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20_ = _tmp19_[0];
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) {
-#line 2500 "TumblrPublishing.c"
-						gchar** _tmp21_;
-						gint _tmp21__length1;
-						const gchar* _tmp22_;
-						gchar* _tmp23_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp21_ = split_pair;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp21__length1 = split_pair_length1;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp22_ = _tmp21_[1];
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp23_ = g_strdup (_tmp22_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_g_free0 (oauth_token_secret);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						oauth_token_secret = _tmp23_;
-#line 2517 "TumblrPublishing.c"
-					}
-				}
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (pair);
-#line 2524 "TumblrPublishing.c"
-			}
-		}
-	}
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25_ = oauth_token;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp25_ == NULL) {
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = TRUE;
-#line 2534 "TumblrPublishing.c"
-	} else {
-		const gchar* _tmp26_;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = oauth_token_secret;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = _tmp26_ == NULL;
-#line 2541 "TumblrPublishing.c"
-	}
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp24_) {
-#line 2545 "TumblrPublishing.c"
-		SpitPublishingPluginHost* _tmp27_;
-		const gchar* _tmp28_;
-		GError* _tmp29_;
-		GError* _tmp30_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = self->priv->host;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = response;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _ ("“%s” isn’t a valid response to an OAuth authentication request"), _tmp28_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = _tmp29_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (_tmp30_);
-#line 2562 "TumblrPublishing.c"
-	}
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp31_ = self->priv->session;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp32_ = oauth_token;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = oauth_token_secret;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp31_, _tmp32_, _tmp33_);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (oauth_token_secret);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (oauth_token);
-#line 2578 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_;
-	PublishingTumblrTumblrPublisherSession* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	PublishingTumblrTumblrPublisherSession* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2598 "TumblrPublishing.c"
-	}
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:332: EVENT: a fully authenticated session has be" \
-"come available");
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->session;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp1_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (self, _tmp3_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (_tmp4_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (self, _tmp6_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_get_blogs (self);
-#line 2624 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 2631 "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 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2638 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:340: ACTION: obtain all blogs of the tumblr user");
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (_tmp0_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	txn = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 2661 "TumblrPublishing.c"
-	{
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2669 "TumblrPublishing.c"
-				goto __catch33_spit_publishing_publishing_error;
-			}
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 2680 "TumblrPublishing.c"
-		}
-	}
-	goto __finally33;
-	__catch33_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp2_;
-		GError* _tmp3_;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		err = _inner_error_;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->host;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = err;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (err);
-#line 2701 "TumblrPublishing.c"
-	}
-	__finally33:
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2714 "TumblrPublishing.c"
-	}
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 2718 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingRESTSupportTransaction* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2756 "TumblrPublishing.c"
-	}
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = txn;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:362: EVENT: user info request transaction comple" \
-"ted; response = '%s'", _tmp7_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = txn;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (self, _tmp10_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self);
-#line 2780 "TumblrPublishing.c"
-}
-
-
-static gpointer _json_object_ref0 (gpointer self) {
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? json_object_ref (self) : NULL;
-#line 2787 "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 1407 "/usr/share/vala-0.36/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"
-	g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/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"
-	if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 2806 "TumblrPublishing.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 2813 "TumblrPublishing.c"
-	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = TRUE;
-#line 2819 "TumblrPublishing.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 2829 "TumblrPublishing.c"
-	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 2833 "TumblrPublishing.c"
-		gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 2841 "TumblrPublishing.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"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2873 "TumblrPublishing.c"
-				goto __catch35_g_regex_error;
-			}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return NULL;
-#line 2882 "TumblrPublishing.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"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2898 "TumblrPublishing.c"
-				goto __catch35_g_regex_error;
-			}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return NULL;
-#line 2909 "TumblrPublishing.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"
-		_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 2923 "TumblrPublishing.c"
-	}
-	goto __finally35;
-	__catch35_g_regex_error:
-	{
-		GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_error_free0 (e);
-#line 2937 "TumblrPublishing.c"
-	}
-	__finally35:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return NULL;
-#line 2948 "TumblrPublishing.c"
-	}
-}
-
-
-static void _vala_array_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value) {
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1);
-#line 2960 "TumblrPublishing.c"
-	}
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 2966 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = response;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:370: ACTION: parsing info request response '%s' " \
-"into list of available blogs", _tmp0_);
-#line 2981 "TumblrPublishing.c"
-	{
-		JsonParser* parser = NULL;
-		JsonParser* _tmp1_;
-		const gchar* _tmp2_;
-		JsonObject* root_object = NULL;
-		JsonNode* _tmp3_;
-		JsonObject* _tmp4_;
-		JsonObject* _tmp5_;
-		JsonObject* _tmp6_;
-		JsonObject* _tmp7_;
-		JsonObject* _tmp8_;
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-		const gchar* _tmp11_;
-		JsonObject* _tmp12_;
-		JsonObject* _tmp13_;
-		JsonObject* _tmp14_;
-		JsonArray* _tmp15_;
-		GList* _tmp16_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = json_parser_new ();
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		parser = _tmp1_;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = response;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		json_parser_load_from_data (parser, _tmp2_, (gssize) -1, &_inner_error_);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (parser);
-#line 3013 "TumblrPublishing.c"
-			goto __catch34_g_error;
-		}
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = json_parser_get_root (parser);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = json_node_get_object (_tmp3_);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = _json_object_ref0 (_tmp4_);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		root_object = _tmp5_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = root_object;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = json_object_get_object_member (_tmp6_, "response");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = json_object_get_object_member (_tmp7_, "user");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = json_object_get_string_member (_tmp8_, "name");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = g_strdup (_tmp9_);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (self->priv->username);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->username = _tmp10_;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp11_ = self->priv->username;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:376: Got user name: %s", _tmp11_);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp12_ = root_object;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = json_object_get_object_member (_tmp12_, "response");
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp14_ = json_object_get_object_member (_tmp13_, "user");
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp15_ = json_object_get_array_member (_tmp14_, "blogs");
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp16_ = json_array_get_elements (_tmp15_);
-#line 3052 "TumblrPublishing.c"
-		{
-			GList* blognode_collection = NULL;
-			GList* blognode_it = NULL;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			blognode_collection = _tmp16_;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) {
-#line 3060 "TumblrPublishing.c"
-				JsonNode* blognode = NULL;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				blognode = (JsonNode*) blognode_it->data;
-#line 3064 "TumblrPublishing.c"
-				{
-					JsonObject* blog = NULL;
-					JsonNode* _tmp17_;
-					JsonObject* _tmp18_;
-					JsonObject* _tmp19_;
-					gchar* name = NULL;
-					JsonObject* _tmp20_;
-					const gchar* _tmp21_;
-					gchar* _tmp22_;
-					gchar* url = NULL;
-					JsonObject* _tmp23_;
-					const gchar* _tmp24_;
-					gchar* _tmp25_;
-					gchar* _tmp26_;
-					gchar* _tmp27_;
-					gchar* _tmp28_;
-					const gchar* _tmp29_;
-					const gchar* _tmp30_;
-					PublishingTumblrBlogEntry** _tmp31_;
-					gint _tmp31__length1;
-					const gchar* _tmp32_;
-					const gchar* _tmp33_;
-					PublishingTumblrBlogEntry* _tmp34_;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17_ = blognode;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp18_ = json_node_get_object (_tmp17_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19_ = _json_object_ref0 (_tmp18_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					blog = _tmp19_;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20_ = blog;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp21_ = json_object_get_string_member (_tmp20_, "name");
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp22_ = g_strdup (_tmp21_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					name = _tmp22_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp23_ = blog;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp24_ = json_object_get_string_member (_tmp23_, "url");
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp25_ = string_replace (_tmp24_, "http://", "");
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp26_ = _tmp25_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp27_ = string_replace (_tmp26_, "/", "");
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp28_ = _tmp27_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (_tmp26_);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					url = _tmp28_;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp29_ = name;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp30_ = url;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					g_debug ("TumblrPublishing.vala:381: Got blog name: %s and url: %s", _tmp29_, _tmp30_);
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp31_ = self->priv->blogs;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp31__length1 = self->priv->blogs_length1;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp32_ = name;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp33_ = url;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp34_ = publishing_tumblr_blog_entry_new (_tmp32_, _tmp33_);
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_vala_array_add21 (&self->priv->blogs, &self->priv->blogs_length1, &self->priv->_blogs_size_, _tmp34_);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (url);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (name);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_json_object_unref0 (blog);
-#line 3144 "TumblrPublishing.c"
-				}
-			}
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_list_free0 (blognode_collection);
-#line 3149 "TumblrPublishing.c"
-		}
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_json_object_unref0 (root_object);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (parser);
-#line 3155 "TumblrPublishing.c"
-	}
-	goto __finally34;
-	__catch34_g_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp35_;
-		GError* _tmp36_;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		err = _inner_error_;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = self->priv->host;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = err;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (err);
-#line 3175 "TumblrPublishing.c"
-	}
-	__finally34:
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3186 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingTumblrTumblrPublisherSession* _tmp5_;
-	SpitPublishingPluginHost* _tmp6_;
-	GError* _tmp7_;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = 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-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3222 "TumblrPublishing.c"
-	}
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = self->priv->session;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_deauthenticate (_tmp5_);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_invalidate_persistent_session (self);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:399: EVENT: user info request transaction caused" \
-" a network error");
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = self->priv->host;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = err;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 3238 "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 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self);
-#line 3245 "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 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self);
-#line 3252 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL;
-	SpitPublishingPluginHost* _tmp1_;
-	SpitPublishingPublisherMediaType _tmp2_;
-	PublishingTumblrSizeEntry** _tmp3_;
-	gint _tmp3__length1;
-	PublishingTumblrBlogEntry** _tmp4_;
-	gint _tmp4__length1;
-	const gchar* _tmp5_;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:404: ACTION: displaying publishing options pane");
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp1_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->sizes;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3__length1 = self->priv->sizes_length1;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->blogs;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = self->priv->blogs_length1;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = self->priv->username;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_tumblr_publisher_publishing_options_pane_new (self, _tmp2_, _tmp3_, _tmp3__length1, _tmp4_, _tmp4__length1, _tmp5_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_options_pane = _tmp6_;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = self->priv->host;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (publishing_options_pane);
-#line 3304 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
-	gboolean _tmp5_;
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publishing_options_pane;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 3317 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
-		guint _tmp2_;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
-		guint _tmp4_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->publishing_options_pane;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = self->priv->publishing_options_pane;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 3334 "TumblrPublishing.c"
-	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp5_) {
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3342 "TumblrPublishing.c"
-	}
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:424: EVENT: user clicked the 'Publish' button in" \
-" the publishing options pane");
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_publish (self);
-#line 3348 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
-	gboolean _tmp5_;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publishing_options_pane;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 3361 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
-		guint _tmp2_;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
-		guint _tmp4_;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->publishing_options_pane;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = self->priv->publishing_options_pane;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 3378 "TumblrPublishing.c"
-	}
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp5_) {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3386 "TumblrPublishing.c"
-	}
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:437: EVENT: user clicked the 'Logout' button in " \
-"the publishing options pane");
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_logout (self);
-#line 3392 "TumblrPublishing.c"
-}
-
-
-gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
-	gint result = 0;
-	SpitPublishingPublishable* _tmp0_;
-	GDateTime* _tmp1_;
-	GDateTime* _tmp2_;
-	SpitPublishingPublishable* _tmp3_;
-	GDateTime* _tmp4_;
-	GDateTime* _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = a;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = b;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_date_time_unref0 (_tmp5_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_date_time_unref0 (_tmp2_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp7_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 3434 "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 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 3443 "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 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published);
-#line 3450 "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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 3457 "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 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete);
-#line 3464 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingTumblrSizeEntry** _tmp2_;
-	gint _tmp2__length1;
-	gint _tmp3_;
-	PublishingTumblrSizeEntry* _tmp4_;
-	gint _tmp5_;
-	void* _tmp6_;
-	GDestroyNotify _tmp7_;
-	SpitPublishingProgressCallback _tmp8_;
-	gboolean _tmp9_;
-	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_;
-	gint _tmp11_;
-	SpitPublishingPublishable** _tmp12_;
-	gint publishables_length1;
-	gint _publishables_size_;
-	GeeArrayList* sorted_list = NULL;
-	GeeArrayList* _tmp13_;
-	SpitPublishingPublishable** _tmp14_;
-	gint _tmp14__length1;
-	GeeArrayList* _tmp18_;
-	gchar* blog_url = NULL;
-	PublishingTumblrBlogEntry** _tmp19_;
-	gint _tmp19__length1;
-	gint _tmp20_;
-	PublishingTumblrBlogEntry* _tmp21_;
-	const gchar* _tmp22_;
-	gchar* _tmp23_;
-	PublishingTumblrTumblrPublisherUploader* uploader = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp24_;
-	GeeArrayList* _tmp25_;
-	gint _tmp26_;
-	gpointer* _tmp27_;
-	SpitPublishingPublishable** _tmp28_;
-	gint _tmp28__length1;
-	const gchar* _tmp29_;
-	PublishingTumblrTumblrPublisherUploader* _tmp30_;
-	PublishingTumblrTumblrPublisherUploader* _tmp31_;
-	PublishingTumblrTumblrPublisherUploader* _tmp32_;
-	PublishingTumblrTumblrPublisherUploader* _tmp33_;
-	PublishingTumblrTumblrPublisherUploader* _tmp34_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:448: ACTION: uploading media items to remote ser" \
-"ver.");
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->sizes;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__length1 = self->priv->sizes_length1;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (self);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _tmp2_[_tmp3_];
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_->size;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp5_, FALSE, &_tmp6_, &_tmp7_);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = _tmp8_;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = _tmp6_;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp9_) {
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3553 "TumblrPublishing.c"
-	}
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = self->priv->host;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishables = _tmp12_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishables_length1 = _tmp11_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishables_size_ = publishables_length1;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_list = _tmp13_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14_ = publishables;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14__length1 = publishables_length1;
-#line 3573 "TumblrPublishing.c"
-	{
-		SpitPublishingPublishable** p_collection = NULL;
-		gint p_collection_length1 = 0;
-		gint _p_collection_size_ = 0;
-		gint p_it = 0;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		p_collection = _tmp14_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		p_collection_length1 = _tmp14__length1;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 3585 "TumblrPublishing.c"
-			SpitPublishingPublishable* _tmp15_;
-			SpitPublishingPublishable* p = NULL;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			p = _tmp15_;
-#line 3592 "TumblrPublishing.c"
-			{
-				GeeArrayList* _tmp16_;
-				SpitPublishingPublishable* _tmp17_;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				g_debug ("TumblrPublishing.vala:466: ACTION: add publishable");
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = sorted_list;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp17_ = p;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_object_unref0 (p);
-#line 3606 "TumblrPublishing.c"
-			}
-		}
-	}
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp18_ = sorted_list;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func, NULL, NULL);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp19_ = self->priv->blogs;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp19__length1 = self->priv->blogs_length1;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp20_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (self);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp21_ = _tmp19_[_tmp20_];
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp22_ = _tmp21_->url;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp23_ = g_strdup (_tmp22_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	blog_url = _tmp23_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp24_ = self->priv->session;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25_ = sorted_list;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp27_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp26_);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28_ = _tmp27_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28__length1 = _tmp26_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp29_ = blog_url;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp30_ = publishing_tumblr_tumblr_publisher_uploader_new (_tmp24_, _tmp28_, _tmp26_, _tmp29_);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp31_ = _tmp30_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28_ = (_vala_array_free (_tmp28_, _tmp28__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	uploader = _tmp31_;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp32_ = uploader;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, 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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = uploader;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, 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 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = uploader;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (blog_url);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (sorted_list);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3668 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:479: ACTION: showing success pane.");
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3687 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* 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 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3708 "TumblrPublishing.c"
-	}
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = completed_fraction;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:490: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp1_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->progress_reporter;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->progress_reporter;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = file_number;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = completed_fraction;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 3730 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_;
-	gint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportBatchUploader* _tmp4_;
-	guint _tmp5_;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = 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-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3751 "TumblrPublishing.c"
-	}
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = num_published;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:502: EVENT: uploader reports upload complete; %d" \
-" items published.", _tmp1_);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = uploader;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = uploader;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_show_success_pane (self);
-#line 3771 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* 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 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3795 "TumblrPublishing.c"
-	}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = err;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_->message;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:515: EVENT: uploader reports upload error = '%s'" \
-".", _tmp2_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = uploader;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = uploader;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = self->priv->host;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = err;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 3821 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:525: ACTION: logging user out, deauthenticating " \
-"session, and erasing stored credentials");
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_deauthenticate (_tmp0_);
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_invalidate_persistent_session (self);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = FALSE;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3841 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_) {
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3856 "TumblrPublishing.c"
-	}
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:539: TumblrPublisher: starting interaction.");
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = TRUE;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_is_persistent_session_valid (self);
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp1_) {
-#line 3866 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp2_;
-		gchar* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:543: attempt start: a persistent session is avai" \
-"lable; using it");
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->session;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (self);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = _tmp3_;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (self);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (_tmp2_, _tmp4_, _tmp6_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp6_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp4_);
-#line 3890 "TumblrPublishing.c"
-	} else {
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:548: attempt start: no persistent session availa" \
-"ble; showing login welcome pane");
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_do_show_authentication_pane (self, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3896 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_) {
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3913 "TumblrPublishing.c"
-	}
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->was_started;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp1_) {
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_error ("TumblrPublishing.vala:559: %s", _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
-"ble."));
-#line 3921 "TumblrPublishing.c"
-	}
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:561: TumblrPublisher: starting interaction.");
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3927 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:567: TumblrPublisher: stop( ) invoked.");
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = FALSE;
-#line 3939 "TumblrPublishing.c"
-}
-
-
-GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile)) {
-		static const GEnumValue values[] = {{PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
-		GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id;
-		publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id = g_enum_register_static ("PublishingTumblrTumblrPublisherAuthenticationPaneMode", values);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile, publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile;
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3958 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3965 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3972 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self = NULL;
-	GtkBox* _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherAuthenticationPane*) g_object_new (object_type, NULL);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_object_ref_sink (_tmp0_);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
-#line 3992 "TumblrPublishing.c"
-	{
-		GtkBuilder* _tmp1_;
-		GtkBuilder* _tmp2_;
-		GtkBuilder* _tmp3_;
-		GtkWidget* content = NULL;
-		GtkBuilder* _tmp4_;
-		GObject* _tmp5_;
-		GtkWidget* _tmp6_;
-		GtkLabel* message_label = NULL;
-		GtkBuilder* _tmp7_;
-		GObject* _tmp8_;
-		GtkLabel* _tmp9_;
-		PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp10_;
-		GtkBuilder* _tmp17_;
-		GObject* _tmp18_;
-		GtkEntry* _tmp19_;
-		GtkBuilder* _tmp20_;
-		GObject* _tmp21_;
-		GtkEntry* _tmp22_;
-		GtkBuilder* _tmp23_;
-		GObject* _tmp24_;
-		GtkButton* _tmp25_;
-		GtkEntry* _tmp26_;
-		GtkEntry* _tmp27_;
-		GtkButton* _tmp28_;
-		GtkWidget* _tmp29_;
-		GtkContainer* _tmp30_;
-		GtkContainer* _tmp31_;
-		GtkWidget* _tmp32_;
-		GtkBox* _tmp33_;
-		GtkWidget* _tmp34_;
-		PublishingTumblrTumblrPublisher* _tmp35_;
-		SpitPublishingPluginHost* _tmp36_;
-		SpitPublishingPluginHost* _tmp37_;
-		GtkButton* _tmp38_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = gtk_builder_new ();
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->builder);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->builder = _tmp1_;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->builder;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4040 "TumblrPublishing.c"
-			goto __catch36_g_error;
-		}
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = self->priv->builder;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_connect_signals (_tmp3_, NULL);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = self->priv->builder;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = gtk_builder_get_object (_tmp4_, "content");
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		content = _tmp6_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = self->priv->builder;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = gtk_builder_get_object (_tmp7_, "message_label");
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		message_label = _tmp9_;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = mode;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		switch (_tmp10_) {
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO:
-#line 4069 "TumblrPublishing.c"
-			{
-				GtkLabel* _tmp11_;
-				const gchar* _tmp12_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp11_ = message_label;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp12_ = publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gtk_label_set_text (_tmp11_, _tmp12_);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				break;
-#line 4081 "TumblrPublishing.c"
-			}
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 4085 "TumblrPublishing.c"
-			{
-				GtkLabel* _tmp13_;
-				const gchar* _tmp14_;
-				gchar* _tmp15_;
-				gchar* _tmp16_;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp13_ = message_label;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp14_);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = _tmp15_;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gtk_label_set_markup (_tmp13_, _tmp16_);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp16_);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				break;
-#line 4105 "TumblrPublishing.c"
-			}
-			default:
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			break;
-#line 4110 "TumblrPublishing.c"
-		}
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = self->priv->builder;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->username_entry);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->username_entry = _tmp19_;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = self->priv->builder;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry");
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->password_entry);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->password_entry = _tmp22_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp23_ = self->priv->builder;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = gtk_builder_get_object (_tmp23_, "login_button");
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->login_button);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->login_button = _tmp25_;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = self->priv->username_entry;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = self->priv->password_entry;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = self->priv->login_button;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = content;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = gtk_widget_get_parent (_tmp29_);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = _tmp30_;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = content;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_remove (_tmp31_, _tmp32_);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = self->priv->pane_widget;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp34_ = content;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), _tmp34_);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = publisher;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = publishing_tumblr_tumblr_publisher_get_host (_tmp35_);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = _tmp36_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = self->priv->login_button;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (_tmp37_);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (message_label);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (content);
-#line 4186 "TumblrPublishing.c"
-	}
-	goto __finally36;
-	__catch36_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp39_;
-		const gchar* _tmp40_;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		e = _inner_error_;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = e;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp40_ = _tmp39_->message;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_ ("Could not load UI: %s"), _tmp40_);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (e);
-#line 4206 "TumblrPublishing.c"
-	}
-	__finally36:
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return NULL;
-#line 4217 "TumblrPublishing.c"
-	}
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 4221 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_authentication_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 4228 "TumblrPublishing.c"
-}
-
-
-GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	GtkWidget* result = NULL;
-	GtkButton* _tmp0_;
-	GtkWidget* _tmp1_;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->login_button;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4246 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	GtkEntry* _tmp0_;
-	const gchar* _tmp1_;
-	GtkEntry* _tmp2_;
-	const gchar* _tmp3_;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->username_entry;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->password_entry;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit (self, publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_);
-#line 4267 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4276 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4285 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkEntry* _tmp1_;
-	guint _tmp2_;
-	guint _tmp3_;
-	GtkButton* _tmp7_;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->username_entry;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp3_ > ((guint) 0)) {
-#line 4305 "TumblrPublishing.c"
-		GtkEntry* _tmp4_;
-		guint _tmp5_;
-		guint _tmp6_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = self->priv->password_entry;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = gtk_entry_get_text_length (_tmp4_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 4317 "TumblrPublishing.c"
-	} else {
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 4321 "TumblrPublishing.c"
-	}
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = self->priv->login_button;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 4327 "TumblrPublishing.c"
-}
-
-
-static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_;
-	GtkWidget* _tmp1_;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4346 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4359 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	GtkEntry* _tmp0_;
-	GtkEntry* _tmp1_;
-	GtkButton* _tmp2_;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->username_entry;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->password_entry;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_entry_set_activates_default (_tmp1_, TRUE);
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->login_button;
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4384 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 4392 "TumblrPublishing.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, gpointer data2);
-	register GMarshalFunc_VOID__STRING_STRING callback;
-	register GCClosure * cc;
-	register gpointer data1;
-	register gpointer data2;
-	cc = (GCClosure *) closure;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (n_param_values == 3);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data1 = closure->data;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data2 = param_values->data[0].v_pointer;
-#line 4411 "TumblrPublishing.c"
-	} else {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data1 = param_values->data[0].v_pointer;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data2 = closure->data;
-#line 4417 "TumblrPublishing.c"
-	}
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 4423 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (PublishingTumblrTumblrPublisherAuthenticationPaneClass * klass) {
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherAuthenticationPanePrivate));
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_authentication_pane_finalize;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup (_ ("Enter the username and password associated with your Tumblr account."));
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp0_;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
-#line 4446 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled;
-#line 4461 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_instance_init (PublishingTumblrTumblrPublisherAuthenticationPane * self) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 4470 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->username_entry);
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->password_entry);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->login_button);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_authentication_pane_parent_class)->finalize (obj);
-#line 4490 "TumblrPublishing.c"
-}
-
-
-/**
- * The authentication pane used when asking service URL, user name and password
- * from the user.
- */
-GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherAuthenticationPane), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_authentication_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType publishing_tumblr_tumblr_publisher_authentication_pane_type_id;
-		publishing_tumblr_tumblr_publisher_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisherAuthenticationPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile, publishing_tumblr_tumblr_publisher_authentication_pane_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile;
-}
-
-
-static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) {
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_tumblr_size_entry_ref (self) : NULL;
-#line 4515 "TumblrPublishing.c"
-}
-
-
-static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry** self, int length) {
-	PublishingTumblrSizeEntry** result;
-	int i;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (PublishingTumblrSizeEntry*, length + 1);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 4526 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry* _tmp0_;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 4532 "TumblrPublishing.c"
-	}
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4536 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) {
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_tumblr_blog_entry_ref (self) : NULL;
-#line 4543 "TumblrPublishing.c"
-}
-
-
-static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry** self, int length) {
-	PublishingTumblrBlogEntry** result;
-	int i;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (PublishingTumblrBlogEntry*, length + 1);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 4554 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry* _tmp0_;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 4560 "TumblrPublishing.c"
-	}
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4564 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4571 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4578 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4585 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4592 "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_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	PublishingTumblrTumblrPublisher* _tmp3_;
-	PublishingTumblrTumblrPublisher* _tmp4_;
-	SpitPublishingPublisherMediaType _tmp5_;
-	PublishingTumblrSizeEntry** _tmp6_;
-	gint _tmp6__length1;
-	PublishingTumblrSizeEntry** _tmp7_;
-	gint _tmp7__length1;
-	PublishingTumblrBlogEntry** _tmp8_;
-	gint _tmp8__length1;
-	PublishingTumblrBlogEntry** _tmp9_;
-	gint _tmp9__length1;
-	GError * _inner_error_ = NULL;
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (username != NULL, NULL);
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_object_ref_sink (_tmp0_);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = username;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp2_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publisher;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publisher);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publisher = _tmp4_;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = media_type;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->media_type = _tmp5_;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = sizes;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6__length1 = sizes_length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup7 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = _tmp6__length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = _tmp7_;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = _tmp7__length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = blogs;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8__length1 = blogs_length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = _tmp9_;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = _tmp9__length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 4679 "TumblrPublishing.c"
-	{
-		GtkBuilder* _tmp10_;
-		GtkBuilder* _tmp11_;
-		GtkBuilder* _tmp12_;
-		GtkBuilder* _tmp13_;
-		GObject* _tmp14_;
-		GtkBox* _tmp15_;
-		GtkBuilder* _tmp16_;
-		GObject* _tmp17_;
-		GtkLabel* _tmp18_;
-		GtkBuilder* _tmp19_;
-		GObject* _tmp20_;
-		GtkButton* _tmp21_;
-		GtkBuilder* _tmp22_;
-		GObject* _tmp23_;
-		GtkButton* _tmp24_;
-		GtkBuilder* _tmp25_;
-		GObject* _tmp26_;
-		GtkComboBoxText* _tmp27_;
-		GtkBuilder* _tmp28_;
-		GObject* _tmp29_;
-		GtkLabel* _tmp30_;
-		GtkBuilder* _tmp31_;
-		GObject* _tmp32_;
-		GtkComboBoxText* _tmp33_;
-		GtkBuilder* _tmp34_;
-		GObject* _tmp35_;
-		GtkLabel* _tmp36_;
-		gchar* upload_label_text = NULL;
-		const gchar* _tmp37_;
-		gchar* _tmp38_;
-		GtkLabel* _tmp39_;
-		const gchar* _tmp40_;
-		GtkComboBoxText* _tmp41_;
-		SpitPublishingPublisherMediaType _tmp42_;
-		GtkButton* _tmp46_;
-		GtkButton* _tmp47_;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = gtk_builder_new ();
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->builder);
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->builder = _tmp10_;
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp11_ = self->priv->builder;
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4729 "TumblrPublishing.c"
-			goto __catch37_g_error;
-		}
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp12_ = self->priv->builder;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_connect_signals (_tmp12_, NULL);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = self->priv->builder;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp14_ = gtk_builder_get_object (_tmp13_, "tumblr_pane");
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->pane_widget);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->pane_widget = _tmp15_;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp16_ = self->priv->builder;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = gtk_builder_get_object (_tmp16_, "upload_info_label");
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->upload_info_label);
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->upload_info_label = _tmp18_;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = self->priv->builder;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = gtk_builder_get_object (_tmp19_, "logout_button");
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->logout_button);
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->logout_button = _tmp21_;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = self->priv->builder;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp23_ = gtk_builder_get_object (_tmp22_, "publish_button");
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->publish_button);
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->publish_button = _tmp24_;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = self->priv->builder;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->size_combo);
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->size_combo = _tmp27_;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = self->priv->builder;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->size_label);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->size_label = _tmp30_;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = self->priv->builder;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = gtk_builder_get_object (_tmp31_, "blog_combo");
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->blog_combo);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->blog_combo = _tmp33_;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp34_ = self->priv->builder;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = gtk_builder_get_object (_tmp34_, "blog_label");
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_label_get_type (), GtkLabel));
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->blog_label);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->blog_label = _tmp36_;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = self->priv->username;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp37_);
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		upload_label_text = _tmp38_;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = self->priv->upload_info_label;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp40_ = upload_label_text;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_label_set_label (_tmp39_, _tmp40_);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp41_ = self->priv->blog_combo;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, 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 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp42_ = media_type;
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_tmp42_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4838 "TumblrPublishing.c"
-			GtkComboBoxText* _tmp43_;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp43_ = self->priv->size_combo;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, 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 4846 "TumblrPublishing.c"
-		} else {
-			GtkComboBoxText* _tmp44_;
-			GtkLabel* _tmp45_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp44_ = self->priv->size_combo;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp45_ = self->priv->size_label;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4858 "TumblrPublishing.c"
-		}
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp46_ = self->priv->logout_button;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp46_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp47_ = self->priv->publish_button;
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (upload_label_text);
-#line 4870 "TumblrPublishing.c"
-	}
-	goto __finally37;
-	__catch37_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp48_;
-		const gchar* _tmp49_;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		e = _inner_error_;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp48_ = e;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp49_ = _tmp48_->message;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_ ("Could not load UI: %s"), _tmp49_);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (e);
-#line 4890 "TumblrPublishing.c"
-	}
-	__finally37:
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return NULL;
-#line 4901 "TumblrPublishing.c"
-	}
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 4905 "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 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 4912 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 4921 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 4930 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrBlogEntry** _tmp0_;
-	gint _tmp0__length1;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->blogs;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->blogs_length1;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 4945 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry** _tmp1_;
-		gint _tmp1__length1;
-		GtkComboBoxText* _tmp6_;
-		PublishingTumblrTumblrPublisher* _tmp7_;
-		gint _tmp8_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->blogs;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1__length1 = self->priv->blogs_length1;
-#line 4955 "TumblrPublishing.c"
-		{
-			PublishingTumblrBlogEntry** b_collection = NULL;
-			gint b_collection_length1 = 0;
-			gint _b_collection_size_ = 0;
-			gint b_it = 0;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			b_collection = _tmp1_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			b_collection_length1 = _tmp1__length1;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) {
-#line 4967 "TumblrPublishing.c"
-				PublishingTumblrBlogEntry* _tmp2_;
-				PublishingTumblrBlogEntry* b = NULL;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				b = _tmp2_;
-#line 4974 "TumblrPublishing.c"
-				{
-					GtkComboBoxText* _tmp3_;
-					PublishingTumblrBlogEntry* _tmp4_;
-					const gchar* _tmp5_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp3_ = self->priv->blog_combo;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp4_ = b;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp5_ = _tmp4_->blog;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_publishing_tumblr_blog_entry_unref0 (b);
-#line 4989 "TumblrPublishing.c"
-				}
-			}
-		}
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = self->priv->blog_combo;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = self->priv->publisher;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 5001 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_;
-	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publisher;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->blog_combo;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_);
-#line 5020 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrSizeEntry** _tmp0_;
-	gint _tmp0__length1;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->sizes;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->sizes_length1;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 5035 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry** _tmp1_;
-		gint _tmp1__length1;
-		GtkComboBoxText* _tmp6_;
-		PublishingTumblrTumblrPublisher* _tmp7_;
-		gint _tmp8_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->sizes;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1__length1 = self->priv->sizes_length1;
-#line 5045 "TumblrPublishing.c"
-		{
-			PublishingTumblrSizeEntry** e_collection = NULL;
-			gint e_collection_length1 = 0;
-			gint _e_collection_size_ = 0;
-			gint e_it = 0;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			e_collection = _tmp1_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			e_collection_length1 = _tmp1__length1;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) {
-#line 5057 "TumblrPublishing.c"
-				PublishingTumblrSizeEntry* _tmp2_;
-				PublishingTumblrSizeEntry* e = NULL;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				e = _tmp2_;
-#line 5064 "TumblrPublishing.c"
-				{
-					GtkComboBoxText* _tmp3_;
-					PublishingTumblrSizeEntry* _tmp4_;
-					const gchar* _tmp5_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp3_ = self->priv->size_combo;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp4_ = e;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp5_ = _tmp4_->title;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_publishing_tumblr_size_entry_unref0 (e);
-#line 5079 "TumblrPublishing.c"
-				}
-			}
-		}
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = self->priv->size_combo;
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = self->priv->publisher;
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_);
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 5091 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_;
-	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publisher;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->size_combo;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5110 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 5119 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 5128 "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 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5147 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5160 "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 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5167 "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 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5174 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 5186 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-	guint _tmp0_;
-	guint _tmp1_;
-#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 5204 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate));
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 5219 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
-#line 5234 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) {
-	gchar* _tmp0_;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->upload_info_label = NULL;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->size_label = NULL;
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_label = NULL;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->logout_button = NULL;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publish_button = NULL;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->size_combo = NULL;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_combo = NULL;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = NULL;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = 0;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = NULL;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = 0;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp0_;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publisher = NULL;
-#line 5276 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->upload_info_label);
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->size_label);
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->blog_label);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->logout_button);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publish_button);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->size_combo);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->blog_combo);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publisher);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj);
-#line 5312 "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;
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
-	PublishingTumblrTumblrPublisherTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = method;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5347 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, method);
-#line 5354 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-	PublishingTumblrTumblrPublisherTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportHttpMethod _tmp2_;
-	PublishingTumblrTumblrPublisherSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingTumblrTumblrPublisherSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	PublishingTumblrTumblrPublisherSession* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-	gboolean _tmp12_;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (uri != NULL, NULL);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = uri;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = method;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherTransaction*) 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 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = session;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp3_);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp5_);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.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 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = session;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp6_);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp8_);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = session;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp9_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp12_ = _tmp11_ != NULL;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp11_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp12_) {
-#line 5423 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = session;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp14_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp13_);
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp15_ = _tmp14_;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp15_);
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp15_);
-#line 5437 "TumblrPublishing.c"
-	}
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5441 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, uri, method);
-#line 5448 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
-	PublishingTumblrTumblrPublisherTransaction * self;
-	PublishingRESTSupportSession* _tmp0_;
-	PublishingTumblrTumblrPublisherSession* _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 5477 "TumblrPublishing.c"
-		} else {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 5485 "TumblrPublishing.c"
-		}
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_transaction_class_init (PublishingTumblrTumblrPublisherTransactionClass * klass) {
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute;
-#line 5496 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_transaction_instance_init (PublishingTumblrTumblrPublisherTransaction * self) {
-}
-
-
-GType publishing_tumblr_tumblr_publisher_transaction_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_transaction_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_transaction_type_id;
-		publishing_tumblr_tumblr_publisher_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingTumblrTumblrPublisherTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_transaction_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_transaction_type_id__volatile;
-}
-
-
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) {
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (username != NULL, NULL);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (password != NULL, NULL);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = username;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = soup_uri_encode (_tmp1_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp3_);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = password;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth");
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5551 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) {
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password);
-#line 5558 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass * klass) {
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5565 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_instance_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction * self) {
-}
-
-
-GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id;
-		publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id = g_type_register_static (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, "PublishingTumblrTumblrPublisherAccessTokenFetchTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile;
-}
-
-
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session) {
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5596 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session) {
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session);
-#line 5603 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) {
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5610 "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_TUMBLR_TUMBLR_PUBLISHER_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_;
-	guint8* _tmp4_;
-	gint _tmp4__length1;
-	GString* _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_string_new ("");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	s = _tmp0_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_new0 (gchar, 2);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	bytes = _tmp1_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	bytes_length1 = 2;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_bytes_size_ = bytes_length1;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = bytes;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__length1 = bytes_length1;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_[1] = (gchar) 0;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_[1];
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = data;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = data_length1;
-#line 5672 "TumblrPublishing.c"
-	{
-		guint8* byte_collection = NULL;
-		gint byte_collection_length1 = 0;
-		gint _byte_collection_size_ = 0;
-		gint byte_it = 0;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		byte_collection = _tmp4_;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		byte_collection_length1 = _tmp4__length1;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) {
-#line 5684 "TumblrPublishing.c"
-			guint8 byte = 0U;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			byte = byte_collection[byte_it];
-#line 5688 "TumblrPublishing.c"
-			{
-				guint8 _tmp5_;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp5_ = byte;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (((gint) _tmp5_) == 0) {
-#line 5695 "TumblrPublishing.c"
-					GString* _tmp6_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp6_ = s;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					g_string_append (_tmp6_, "%00");
-#line 5701 "TumblrPublishing.c"
-				} else {
-					gchar* _tmp7_;
-					gint _tmp7__length1;
-					guint8 _tmp8_;
-					gchar _tmp9_;
-					GString* _tmp10_;
-					gchar* _tmp11_;
-					gint _tmp11__length1;
-					gchar* _tmp12_;
-					gchar* _tmp13_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp7_ = bytes;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp7__length1 = bytes_length1;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp8_ = byte;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp7_[0] = (gchar) _tmp8_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp9_ = _tmp7_[0];
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp10_ = s;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11_ = bytes;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11__length1 = bytes_length1;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp12_ = soup_uri_encode ((const gchar*) _tmp11_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp13_ = _tmp12_;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					g_string_append (_tmp10_, _tmp13_);
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (_tmp13_);
-#line 5736 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14_ = s;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp15_ = _tmp14_->str;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp16_;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	bytes = (g_free (bytes), NULL);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_string_free0 (s);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5755 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5762 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
-	PublishingTumblrTumblrPublisherUploadTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	SpitPublishingPublishable* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	PublishingTumblrTumblrPublisherSession* _tmp5_;
-	PublishingTumblrTumblrPublisherSession* _tmp6_;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (blog_url != NULL, NULL);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:898: Init upload transaction");
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishable;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = blog_url;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup_printf ("https://api.tumblr.com/v2/blog/%s/post", _tmp2_);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp4_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = session;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = _publishing_rest_support_session_ref0 (_tmp5_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->session = _tmp6_;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5807 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url);
-#line 5814 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 5825 "TumblrPublishing.c"
-	}
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 5831 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value) {
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRESTSupportArgument* _tmp3_;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self));
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (key != NULL);
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (value != NULL);
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = key;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = value;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add22 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 5859 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 5866 "TumblrPublishing.c"
-}
-
-
-static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) {
-	PublishingRESTSupportArgument** result;
-	int i;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 5877 "TumblrPublishing.c"
-		PublishingRESTSupportArgument* _tmp0_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 5883 "TumblrPublishing.c"
-	}
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5887 "TumblrPublishing.c"
-}
-
-
-PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1) {
-	PublishingRESTSupportArgument** result = NULL;
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	PublishingRESTSupportArgument** _tmp1_;
-	gint _tmp1__length1;
-	PublishingRESTSupportArgument** _tmp2_;
-	gint _tmp2__length1;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__length1 = _tmp1__length1;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (result_length1) {
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*result_length1 = _tmp2__length1;
-#line 5917 "TumblrPublishing.c"
-	}
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp2_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5923 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("OAuth ");
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result_ = _tmp0_;
-#line 5937 "TumblrPublishing.c"
-	{
-		gint i = 0;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		i = 0;
-#line 5942 "TumblrPublishing.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp1_ = TRUE;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			while (TRUE) {
-#line 5949 "TumblrPublishing.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 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!_tmp1_) {
-#line 5978 "TumblrPublishing.c"
-					gint _tmp2_;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp2_ = i;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp2_ + 1;
-#line 5984 "TumblrPublishing.c"
-				}
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp1_ = FALSE;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp3_ = i;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp4_ = self->priv->auth_header_fields;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp3_ < _tmp4__length1)) {
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					break;
-#line 5998 "TumblrPublishing.c"
-				}
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp5_ = _result_;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp6_ = self->priv->auth_header_fields;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp7_ = i;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp8_ = _tmp6_[_tmp7_];
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp9_ = _tmp8_->key;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_result_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp10_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp11_ = _result_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_result_);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp12_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp13_ = _result_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = self->priv->auth_header_fields;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = i;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = _tmp14_[_tmp15_];
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp17_ = _tmp16_->value;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp19_ = _tmp18_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp21_ = _tmp20_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_result_);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp22_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp21_);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp19_);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp23_ = i;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp24_ = self->priv->auth_header_fields;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 6064 "TumblrPublishing.c"
-					const gchar* _tmp25_;
-					gchar* _tmp26_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp25_ = _result_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (_result_);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_result_ = _tmp26_;
-#line 6075 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _result_;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 6084 "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 1428 "/usr/share/vala-0.36/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"
-	res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		*result_length1 = _tmp4__length1;
-#line 6128 "TumblrPublishing.c"
-	}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 6134 "TumblrPublishing.c"
-}
-
-
-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"
-		separator = "";
-#line 6151 "TumblrPublishing.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 6161 "TumblrPublishing.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 6171 "TumblrPublishing.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 6177 "TumblrPublishing.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 6188 "TumblrPublishing.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 6200 "TumblrPublishing.c"
-		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 6204 "TumblrPublishing.c"
-		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 6208 "TumblrPublishing.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 6212 "TumblrPublishing.c"
-		gint i = 0;
-		gsize len = 0UL;
-		gint _tmp31_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gsize _tmp35_;
-		const gchar* _tmp36_;
-		gint _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
-		const gchar* res = NULL;
-		gsize _tmp40_;
-		void* _tmp41_;
-		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"
-		len = (gsize) 1;
-#line 6235 "TumblrPublishing.c"
-		{
-			gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/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"
-			while (TRUE) {
-#line 6244 "TumblrPublishing.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 6257 "TumblrPublishing.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 6263 "TumblrPublishing.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 6273 "TumblrPublishing.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 6285 "TumblrPublishing.c"
-				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 6289 "TumblrPublishing.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 6295 "TumblrPublishing.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 6306 "TumblrPublishing.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 6321 "TumblrPublishing.c"
-					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 6325 "TumblrPublishing.c"
-					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 6329 "TumblrPublishing.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"
-					break;
-#line 6335 "TumblrPublishing.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 6347 "TumblrPublishing.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 6368 "TumblrPublishing.c"
-				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 6372 "TumblrPublishing.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 6378 "TumblrPublishing.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 6385 "TumblrPublishing.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"
-			return result;
-#line 6393 "TumblrPublishing.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 6431 "TumblrPublishing.c"
-		{
-			gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/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"
-			while (TRUE) {
-#line 6440 "TumblrPublishing.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 6456 "TumblrPublishing.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 6462 "TumblrPublishing.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"
-					break;
-#line 6476 "TumblrPublishing.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 6496 "TumblrPublishing.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 6511 "TumblrPublishing.c"
-				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 6515 "TumblrPublishing.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 6523 "TumblrPublishing.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"
-		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"
-		return result;
-#line 6534 "TumblrPublishing.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"
-		return result;
-#line 6543 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
-	PublishingTumblrTumblrPublisherUploadTransaction * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	PublishingTumblrTumblrPublisherSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingTumblrTumblrPublisherSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* payload = NULL;
-	gsize payload_length = 0UL;
-	PublishingTumblrTumblrPublisherSession* _tmp33_;
-	gchar* authorization_header = NULL;
-	gchar* _tmp34_;
-	const gchar* _tmp35_;
-	const gchar* _tmp36_;
-	PublishingRESTSupportArgument** request_arguments = NULL;
-	gint _tmp37_;
-	PublishingRESTSupportArgument** _tmp38_;
-	gint request_arguments_length1;
-	gint _request_arguments_size_;
-	PublishingRESTSupportArgument** _tmp39_;
-	gint _tmp39__length1;
-	gchar* request_data = NULL;
-	gchar* _tmp40_;
-	SoupMessage* outbound_message = NULL;
-	gchar* _tmp63_;
-	gchar* _tmp64_;
-	SoupMessage* _tmp65_;
-	SoupMessage* _tmp66_;
-	SoupMessage* _tmp67_;
-	const gchar* _tmp68_;
-	guint8* _tmp69_;
-	gint _tmp69__length1;
-	guint8* _tmp70_;
-	gint _tmp70__length1;
-	GeeMapIterator* i = NULL;
-	GeeHashMap* _tmp71_;
-	GeeMapIterator* _tmp72_;
-	gboolean cont = FALSE;
-	GeeMapIterator* _tmp73_;
-	gboolean _tmp74_;
-	SoupMessage* _tmp86_;
-	GError * _inner_error_ = NULL;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp0_);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp2_);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->session;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp3_);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp5_);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = self->priv->session;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp6_);
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_);
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 6632 "TumblrPublishing.c"
-	{
-		SpitPublishingPublishable* _tmp9_;
-		GFile* _tmp10_;
-		GFile* _tmp11_;
-		gchar* _tmp12_;
-		gchar* _tmp13_;
-		gchar* _tmp14_ = NULL;
-		gsize _tmp15_ = 0UL;
-		gchar* reqdata = NULL;
-		const gchar* _tmp16_;
-		guint8* _tmp17_;
-		gint _tmp17__length1;
-		guint8* _tmp18_;
-		gint _tmp18__length1;
-		gsize _tmp19_;
-		gchar* _tmp20_;
-		const gchar* _tmp21_;
-		gchar** keywords = NULL;
-		SpitPublishingPublishable* _tmp22_;
-		gint _tmp23_;
-		gchar** _tmp24_;
-		gint keywords_length1;
-		gint _keywords_size_;
-		gchar* tags = NULL;
-		gchar* _tmp25_;
-		gchar** _tmp26_;
-		gint _tmp26__length1;
-		const gchar* _tmp29_;
-		gchar* _tmp30_;
-		gchar* _tmp31_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp11_ = _tmp10_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp12_ = g_file_get_path (_tmp11_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = _tmp12_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_file_get_contents (_tmp13_, &_tmp14_, &_tmp15_, &_inner_error_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (payload);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		payload = _tmp14_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		payload_length = _tmp15_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp13_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (_tmp11_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 6689 "TumblrPublishing.c"
-				goto __catch38_g_file_error;
-			}
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 6700 "TumblrPublishing.c"
-		}
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp16_ = payload;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = string_get_data (_tmp16_, &_tmp17__length1);
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = _tmp17_;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18__length1 = _tmp17__length1;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = payload_length;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = publishing_tumblr_tumblr_publisher_upload_transaction_encode (self, _tmp18_ + 0, ((gint) _tmp19_) - 0);
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		reqdata = _tmp20_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = reqdata;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp21_);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo");
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = spit_publishing_publishable_get_publishing_keywords (_tmp22_, &_tmp23_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		keywords = _tmp24_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		keywords_length1 = _tmp23_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_keywords_size_ = keywords_length1;
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = g_strdup ("");
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tags = _tmp25_;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = keywords;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26__length1 = keywords_length1;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_tmp26_ != NULL) {
-#line 6742 "TumblrPublishing.c"
-			gchar** _tmp27_;
-			gint _tmp27__length1;
-			gchar* _tmp28_;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp27_ = keywords;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp27__length1 = keywords_length1;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp28_ = _vala_g_strjoinv (",", _tmp27_, _tmp27__length1);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (tags);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			tags = _tmp28_;
-#line 6756 "TumblrPublishing.c"
-		}
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = tags;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = soup_uri_encode (_tmp29_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = _tmp30_;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp31_);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp31_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (tags);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (reqdata);
-#line 6774 "TumblrPublishing.c"
-	}
-	goto __finally38;
-	__catch38_g_file_error:
-	{
-		GError* e = NULL;
-		GError* _tmp32_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		e = _inner_error_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = _tmp32_;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (e);
-#line 6791 "TumblrPublishing.c"
-		goto __finally38;
-	}
-	__finally38:
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 6805 "TumblrPublishing.c"
-		} else {
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 6815 "TumblrPublishing.c"
-		}
-	}
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = self->priv->session;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self);
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	authorization_header = _tmp34_;
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp35_ = authorization_header;
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:968: executing upload transaction: authorization" \
-" header string = '%s'", _tmp35_);
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp36_ = authorization_header;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp36_);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp38_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp37_);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments = _tmp38_;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments_length1 = _tmp37_;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_request_arguments_size_ = request_arguments_length1;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp39_ = request_arguments;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp39__length1 = request_arguments_length1;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_assert (_tmp39__length1 > 0, "request_arguments.length > 0");
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp40_ = g_strdup ("");
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_data = _tmp40_;
-#line 6852 "TumblrPublishing.c"
-	{
-		gint i = 0;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		i = 0;
-#line 6857 "TumblrPublishing.c"
-		{
-			gboolean _tmp41_ = FALSE;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp41_ = TRUE;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			while (TRUE) {
-#line 6864 "TumblrPublishing.c"
-				gint _tmp43_;
-				PublishingRESTSupportArgument** _tmp44_;
-				gint _tmp44__length1;
-				const gchar* _tmp45_;
-				PublishingRESTSupportArgument** _tmp46_;
-				gint _tmp46__length1;
-				gint _tmp47_;
-				PublishingRESTSupportArgument* _tmp48_;
-				const gchar* _tmp49_;
-				gchar* _tmp50_;
-				gchar* _tmp51_;
-				PublishingRESTSupportArgument** _tmp52_;
-				gint _tmp52__length1;
-				gint _tmp53_;
-				PublishingRESTSupportArgument* _tmp54_;
-				const gchar* _tmp55_;
-				gchar* _tmp56_;
-				gchar* _tmp57_;
-				gchar* _tmp58_;
-				gint _tmp59_;
-				PublishingRESTSupportArgument** _tmp60_;
-				gint _tmp60__length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!_tmp41_) {
-#line 6889 "TumblrPublishing.c"
-					gint _tmp42_;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp42_ = i;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp42_ + 1;
-#line 6895 "TumblrPublishing.c"
-				}
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp41_ = FALSE;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp43_ = i;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44_ = request_arguments;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44__length1 = request_arguments_length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp43_ < _tmp44__length1)) {
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					break;
-#line 6909 "TumblrPublishing.c"
-				}
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45_ = request_data;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46_ = request_arguments;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46__length1 = request_arguments_length1;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48_ = _tmp46_[_tmp47_];
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp49_ = _tmp48_->key;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp50_ = g_strconcat (_tmp49_, "=", NULL);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp51_ = _tmp50_;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp52_ = request_arguments;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp52__length1 = request_arguments_length1;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp53_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp54_ = _tmp52_[_tmp53_];
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp55_ = _tmp54_->value;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp56_ = g_strconcat (_tmp51_, _tmp55_, NULL);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp57_ = _tmp56_;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp58_ = g_strconcat (_tmp45_, _tmp57_, NULL);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (request_data);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				request_data = _tmp58_;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp57_);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp51_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp59_ = i;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp60_ = request_arguments;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp60__length1 = request_arguments_length1;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp59_ < (_tmp60__length1 - 1)) {
-#line 6959 "TumblrPublishing.c"
-					const gchar* _tmp61_;
-					gchar* _tmp62_;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp61_ = request_data;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp62_ = g_strconcat (_tmp61_, "&", NULL);
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (request_data);
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					request_data = _tmp62_;
-#line 6970 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp63_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp64_ = _tmp63_;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp65_ = soup_message_new ("POST", _tmp64_);
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp66_ = _tmp65_;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp64_);
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	outbound_message = _tmp66_;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp67_ = outbound_message;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp68_ = request_data;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp69_ = string_get_data (_tmp68_, &_tmp69__length1);
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70_ = _tmp69_;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70__length1 = _tmp69__length1;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	soup_message_set_request (_tmp67_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp70_, (gsize) _tmp70__length1);
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp72_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	i = _tmp72_;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp73_ = i;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp74_ = gee_map_iterator_next (_tmp73_);
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	cont = _tmp74_;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	while (TRUE) {
-#line 7013 "TumblrPublishing.c"
-		gboolean _tmp75_;
-		SoupMessage* _tmp76_;
-		SoupMessageHeaders* _tmp77_;
-		GeeMapIterator* _tmp78_;
-		gpointer _tmp79_;
-		gchar* _tmp80_;
-		GeeMapIterator* _tmp81_;
-		gpointer _tmp82_;
-		gchar* _tmp83_;
-		GeeMapIterator* _tmp84_;
-		gboolean _tmp85_;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp75_ = cont;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (!_tmp75_) {
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			break;
-#line 7031 "TumblrPublishing.c"
-		}
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp76_ = outbound_message;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp77_ = _tmp76_->request_headers;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp78_ = i;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp79_ = gee_map_iterator_get_key (_tmp78_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp80_ = (gchar*) _tmp79_;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp81_ = i;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp82_ = gee_map_iterator_get_value (_tmp81_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp83_ = (gchar*) _tmp82_;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		soup_message_headers_append (_tmp77_, _tmp80_, _tmp83_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp83_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp80_);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp84_ = i;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp85_ = gee_map_iterator_next (_tmp84_);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		cont = _tmp85_;
-#line 7061 "TumblrPublishing.c"
-	}
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp86_ = outbound_message;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp86_);
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (i);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (request_data);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 7091 "TumblrPublishing.c"
-		} else {
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (i);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (request_data);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 7111 "TumblrPublishing.c"
-		}
-	}
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (i);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (outbound_message);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (request_data);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (authorization_header);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (payload);
-#line 7126 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass) {
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_upload_transaction_finalize;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploadTransactionPrivate));
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
-#line 7139 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) {
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 7146 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
-	PublishingTumblrTumblrPublisherUploadTransaction * self;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
-#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.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 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_upload_transaction_parent_class)->finalize (obj);
-#line 7160 "TumblrPublishing.c"
-}
-
-
-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_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, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
-	PublishingTumblrTumblrPublisherUploader* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (blog_url != NULL, NULL);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishables;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = publishables_length1;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = blog_url;
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->blog_url);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_url = _tmp3_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 7205 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url);
-#line 7212 "TumblrPublishing.c"
-}
-
-
-static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
-	PublishingTumblrTumblrPublisherUploader * self;
-	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_;
-	PublishingTumblrTumblrPublisherSession* _tmp1_;
-	SpitPublishingPublishable* _tmp2_;
-	SpitPublishingPublishable* _tmp3_;
-	const gchar* _tmp4_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_;
-	PublishingRESTSupportTransaction* _tmp6_;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1012: Create upload transaction");
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->blog_url;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_upload_transaction_new (_tmp1_, _tmp3_, _tmp4_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp6_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7254 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass) {
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_uploader_finalize;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate));
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
-#line 7267 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) {
-	gchar* _tmp0_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_url = _tmp0_;
-#line 7279 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
-	PublishingTumblrTumblrPublisherUploader * self;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->blog_url);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj);
-#line 7291 "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;
-}
-
-
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type) {
-	PublishingTumblrTumblrPublisherSession* self = NULL;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_TUMBLR_ENDPOINT_URL);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 7313 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void) {
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_session_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION);
-#line 7320 "TumblrPublishing.c"
-}
-
-
-static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated (PublishingRESTSupportSession* base) {
-	PublishingTumblrTumblrPublisherSession * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->access_phase_token;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp1_ != NULL) {
-#line 7335 "TumblrPublishing.c"
-		const gchar* _tmp2_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->access_phase_token_secret;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _tmp2_ != NULL;
-#line 7341 "TumblrPublishing.c"
-	} else {
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 7345 "TumblrPublishing.c"
-	}
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp0_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7351 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = token;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = secret;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7384 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self) {
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 7399 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 7406 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 7417 "TumblrPublishing.c"
-	}
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 7423 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumblrTumblrPublisherSession* self, PublishingRESTSupportTransaction* txn) {
-	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* signing_key = NULL;
-	const gchar* _tmp6_;
-	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp11_;
-	gint _tmp12_;
-	PublishingRESTSupportArgument** _tmp13_;
-	gint base_string_arguments_length1;
-	gint _base_string_arguments_size_;
-	PublishingTumblrTumblrPublisherUploadTransaction* upload_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp14_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_;
-	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp25_;
-	gint _tmp25__length1;
-	gint _tmp26_;
-	PublishingRESTSupportArgument** _tmp27_;
-	gint sorted_args_length1;
-	gint _sorted_args_size_;
-	gchar* arguments_string = NULL;
-	gchar* _tmp28_;
-	gchar* signature_base_string = NULL;
-	const gchar* _tmp51_;
-	gchar* _tmp52_;
-	gchar* _tmp53_;
-	PublishingRESTSupportTransaction* _tmp54_;
-	gchar* _tmp55_;
-	gchar* _tmp56_;
-	gchar* _tmp57_;
-	gchar* _tmp58_;
-	gchar* _tmp59_;
-	gchar* _tmp60_;
-	gchar* _tmp61_;
-	gchar* _tmp62_;
-	const gchar* _tmp63_;
-	gchar* _tmp64_;
-	gchar* _tmp65_;
-	gchar* _tmp66_;
-	gchar* _tmp67_;
-	const gchar* _tmp68_;
-	const gchar* _tmp69_;
-	gchar* signature = NULL;
-	const gchar* _tmp70_;
-	const gchar* _tmp71_;
-	gchar* _tmp72_;
-	const gchar* _tmp73_;
-	const gchar* _tmp74_;
-	gchar* _tmp75_;
-	const gchar* _tmp76_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	http_method = _tmp2_;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1051: signing transaction with parameters:");
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = http_method;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1052: %s", _tmp5_);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signing_key = NULL;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = self->priv->access_phase_token_secret;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp6_ != NULL) {
-#line 7515 "TumblrPublishing.c"
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1055: access phase token secret available; using" \
-" it as signing key");
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (self);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = _tmp7_;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = g_strconcat (PUBLISHING_TUMBLR_API_SECRET "&", _tmp8_, NULL);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (signing_key);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		signing_key = _tmp9_;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp8_);
-#line 7533 "TumblrPublishing.c"
-	} else {
-		gchar* _tmp10_;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1059: %s", "Access phase token secret not available; using API " "key as signing key");
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = g_strdup (PUBLISHING_TUMBLR_API_SECRET "&");
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (signing_key);
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		signing_key = _tmp10_;
-#line 7544 "TumblrPublishing.c"
-	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp11_ = txn;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp13_ = publishing_rest_support_transaction_get_arguments (_tmp11_, &_tmp12_);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	base_string_arguments = _tmp13_;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	base_string_arguments_length1 = _tmp12_;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14_ = txn;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp15_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION) ? ((PublishingTumblrTumblrPublisherUploadTransaction*) _tmp14_) : NULL);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	upload_txn = _tmp15_;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp16_ = upload_txn;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp16_ != NULL) {
-#line 7566 "TumblrPublishing.c"
-		PublishingRESTSupportArgument** auth_header_args = NULL;
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_;
-		gint _tmp18_;
-		PublishingRESTSupportArgument** _tmp19_;
-		gint auth_header_args_length1;
-		gint _auth_header_args_size_;
-		PublishingRESTSupportArgument** _tmp20_;
-		gint _tmp20__length1;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1070: %s", "this transaction is an UploadTransaction; including Authorization head" \
-"er " "fields in signature base string");
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = upload_txn;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (_tmp17_, &_tmp18_);
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		auth_header_args = _tmp19_;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		auth_header_args_length1 = _tmp18_;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_auth_header_args_size_ = auth_header_args_length1;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = auth_header_args;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20__length1 = auth_header_args_length1;
-#line 7591 "TumblrPublishing.c"
-		{
-			PublishingRESTSupportArgument** arg_collection = NULL;
-			gint arg_collection_length1 = 0;
-			gint _arg_collection_size_ = 0;
-			gint arg_it = 0;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			arg_collection = _tmp20_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			arg_collection_length1 = _tmp20__length1;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (arg_it = 0; arg_it < _tmp20__length1; arg_it = arg_it + 1) {
-#line 7603 "TumblrPublishing.c"
-				PublishingRESTSupportArgument* _tmp21_;
-				PublishingRESTSupportArgument* arg = NULL;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp21_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				arg = _tmp21_;
-#line 7610 "TumblrPublishing.c"
-				{
-					PublishingRESTSupportArgument** _tmp22_;
-					gint _tmp22__length1;
-					PublishingRESTSupportArgument* _tmp23_;
-					PublishingRESTSupportArgument* _tmp24_;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp22_ = base_string_arguments;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp22__length1 = base_string_arguments_length1;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp23_ = arg;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp24_ = _publishing_rest_support_argument_ref0 (_tmp23_);
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_vala_array_add23 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp24_);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_publishing_rest_support_argument_unref0 (arg);
-#line 7628 "TumblrPublishing.c"
-				}
-			}
-		}
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 7634 "TumblrPublishing.c"
-	}
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25_ = base_string_arguments;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25__length1 = base_string_arguments_length1;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp27_ = publishing_rest_support_argument_sort (_tmp25_, _tmp25__length1, &_tmp26_);
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_args = _tmp27_;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_args_length1 = _tmp26_;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_sorted_args_size_ = sorted_args_length1;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28_ = g_strdup ("");
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	arguments_string = _tmp28_;
-#line 7652 "TumblrPublishing.c"
-	{
-		gint i = 0;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		i = 0;
-#line 7657 "TumblrPublishing.c"
-		{
-			gboolean _tmp29_ = FALSE;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp29_ = TRUE;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			while (TRUE) {
-#line 7664 "TumblrPublishing.c"
-				gint _tmp31_;
-				PublishingRESTSupportArgument** _tmp32_;
-				gint _tmp32__length1;
-				const gchar* _tmp33_;
-				PublishingRESTSupportArgument** _tmp34_;
-				gint _tmp34__length1;
-				gint _tmp35_;
-				PublishingRESTSupportArgument* _tmp36_;
-				const gchar* _tmp37_;
-				gchar* _tmp38_;
-				gchar* _tmp39_;
-				PublishingRESTSupportArgument** _tmp40_;
-				gint _tmp40__length1;
-				gint _tmp41_;
-				PublishingRESTSupportArgument* _tmp42_;
-				const gchar* _tmp43_;
-				gchar* _tmp44_;
-				gchar* _tmp45_;
-				gchar* _tmp46_;
-				gint _tmp47_;
-				PublishingRESTSupportArgument** _tmp48_;
-				gint _tmp48__length1;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!_tmp29_) {
-#line 7689 "TumblrPublishing.c"
-					gint _tmp30_;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp30_ = i;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp30_ + 1;
-#line 7695 "TumblrPublishing.c"
-				}
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp29_ = FALSE;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp31_ = i;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp32_ = sorted_args;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp32__length1 = sorted_args_length1;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp31_ < _tmp32__length1)) {
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					break;
-#line 7709 "TumblrPublishing.c"
-				}
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp33_ = arguments_string;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp34_ = sorted_args;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp34__length1 = sorted_args_length1;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp35_ = i;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp36_ = _tmp34_[_tmp35_];
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp37_ = _tmp36_->key;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp38_ = g_strconcat (_tmp37_, "=", NULL);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp39_ = _tmp38_;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp40_ = sorted_args;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp40__length1 = sorted_args_length1;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp41_ = i;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp42_ = _tmp40_[_tmp41_];
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp43_ = _tmp42_->value;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44_ = g_strconcat (_tmp39_, _tmp43_, NULL);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45_ = _tmp44_;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46_ = g_strconcat (_tmp33_, _tmp45_, NULL);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (arguments_string);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				arguments_string = _tmp46_;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp45_);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp39_);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47_ = i;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48_ = sorted_args;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48__length1 = sorted_args_length1;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp47_ < (_tmp48__length1 - 1)) {
-#line 7759 "TumblrPublishing.c"
-					const gchar* _tmp49_;
-					gchar* _tmp50_;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp49_ = arguments_string;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp50_ = g_strconcat (_tmp49_, "&", NULL);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (arguments_string);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					arguments_string = _tmp50_;
-#line 7770 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp51_ = http_method;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp52_ = g_strconcat (_tmp51_, "&", NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp53_ = _tmp52_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp54_ = txn;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp55_ = publishing_rest_support_transaction_get_endpoint_url (_tmp54_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp56_ = _tmp55_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp57_ = soup_uri_encode (_tmp56_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp58_ = _tmp57_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp59_ = g_strconcat (_tmp53_, _tmp58_, NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp60_ = _tmp59_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp61_ = g_strconcat (_tmp60_, "&", NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp62_ = _tmp61_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp63_ = arguments_string;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp64_ = soup_uri_encode (_tmp63_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp65_ = _tmp64_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp66_ = g_strconcat (_tmp62_, _tmp65_, NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp67_ = _tmp66_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp65_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp62_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp60_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp58_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp56_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp53_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signature_base_string = _tmp67_;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp68_ = signature_base_string;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1095: signature base string = '%s'", _tmp68_);
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp69_ = signing_key;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1096: signing key = '%s'", _tmp69_);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70_ = signing_key;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71_ = signature_base_string;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp72_ = publishing_rest_support_hmac_sha1 (_tmp70_, _tmp71_);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signature = _tmp72_;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp73_ = signature;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1100: signature = '%s'", _tmp73_);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp74_ = signature;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp75_ = soup_uri_encode (_tmp74_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signature);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signature = _tmp75_;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp76_ = signature;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1103: signature after RFC encode = '%s'", _tmp76_);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp77_ = upload_txn;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp77_ != NULL) {
-#line 7859 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_;
-		const gchar* _tmp79_;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp78_ = upload_txn;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp79_ = signature;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (_tmp78_, "oauth_signature", _tmp79_);
-#line 7868 "TumblrPublishing.c"
-	} else {
-		PublishingRESTSupportTransaction* _tmp80_;
-		const gchar* _tmp81_;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp80_ = txn;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp81_ = signature;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (_tmp80_, "oauth_signature", _tmp81_);
-#line 7878 "TumblrPublishing.c"
-	}
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signature);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signature_base_string);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (arguments_string);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (upload_txn);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signing_key);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (http_method);
-#line 7896 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = token;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = secret;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7929 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (PublishingTumblrTumblrPublisherSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7947 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (PublishingTumblrTumblrPublisherSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token_secret;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7965 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTumblrTumblrPublisherSession* 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 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = currtime;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _tmp0_.tv_sec;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = currtime;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_.tv_usec;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp11_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 8024 "TumblrPublishing.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 8047 "TumblrPublishing.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 8055 "TumblrPublishing.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 8067 "TumblrPublishing.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 8091 "TumblrPublishing.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 8097 "TumblrPublishing.c"
-	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 8101 "TumblrPublishing.c"
-	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 8105 "TumblrPublishing.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 8117 "TumblrPublishing.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 8127 "TumblrPublishing.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 8133 "TumblrPublishing.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 8147 "TumblrPublishing.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 8157 "TumblrPublishing.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 8163 "TumblrPublishing.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 8172 "TumblrPublishing.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 8192 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (PublishingTumblrTumblrPublisherSession* self) {
-	gchar* result = NULL;
-	gint64 _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_get_real_time ();
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp4_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 8221 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTumblrTumblrPublisherSessionClass * klass) {
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_parent_class = g_type_class_peek_parent (klass);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_session_finalize;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherSessionPrivate));
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated;
-#line 8234 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_session_instance_init (PublishingTumblrTumblrPublisherSession * self) {
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE (self);
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 8245 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * obj) {
-	PublishingTumblrTumblrPublisherSession * self;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_tumblr_tumblr_publisher_session_parent_class)->finalize (obj);
-#line 8259 "TumblrPublishing.c"
-}
-
-
-/**
- * Session class that keeps track of the authentication status and of the
- * user token tumblr.
- */
-GType publishing_tumblr_tumblr_publisher_session_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_session_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_session_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherSession), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_session_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_session_type_id;
-		publishing_tumblr_tumblr_publisher_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingTumblrTumblrPublisherSession", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_session_type_id__volatile, publishing_tumblr_tumblr_publisher_session_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_session_type_id__volatile;
-}
-
-
-static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumblrPublisherClass * klass) {
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate));
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize;
-#line 8286 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_get_service;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_is_running;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_start;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_stop;
-#line 8301 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self) {
-	gchar* _tmp0_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE (self);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = self;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = FALSE;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->was_started = FALSE;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->session = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publishing_options_pane = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = 0;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = NULL;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = 0;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp0_;
-#line 8339 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) {
-	PublishingTumblrTumblrPublisher * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	guint _tmp1_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp1_, NULL, FALSE);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->service);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->host);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/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 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj);
-#line 8379 "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);
-}
-
-
-static gint _vala_array_length (gpointer array) {
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
-
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
deleted file mode 100644
index 12b4ade..0000000
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ /dev/null
@@ -1,1148 +0,0 @@
-/* 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 API_KEY = "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k";
-internal const string API_SECRET = "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi";
-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 Session session = null;
-    private PublishingOptionsPane publishing_options_pane = null;
-    private SizeEntry[] sizes = null;
-    private BlogEntry[] blogs = null;
-	private string username = "";
-
-    
-    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 Session();
-		this.sizes = this.create_sizes();
-		this.blogs = this.create_blogs();
-        session.authenticated.connect(on_session_authenticated);
-    }
-    
-    ~TumblrPublisher() {
-        session.authenticated.disconnect(on_session_authenticated);
-    }
-    
-    private void invalidate_persistent_session() {
-        set_persistent_access_phase_token("");
-        set_persistent_access_phase_token_secret("");
-    }
-    // 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;
-    }
-
-    private bool is_persistent_session_valid() {
-        string? access_phase_token = get_persistent_access_phase_token();
-        string? access_phase_token_secret = get_persistent_access_phase_token_secret();
-
-        bool valid = ((access_phase_token != null) && (access_phase_token_secret != null));
-
-        if (valid)
-            debug("existing Tumblr session found in configuration database; using it.");
-        else
-            debug("no persisted Tumblr session exists.");
-
-        return valid;
-    }
-
-
-
-
-    public string? get_persistent_access_phase_token() {
-        return host.get_config_string("token", null);
-    }
-    
-    private void set_persistent_access_phase_token(string? token) {
-        host.set_config_string("token", token);
-    } 
-    
-    public string? get_persistent_access_phase_token_secret() {
-        return host.get_config_string("token_secret", null);
-    }
-    
-    private void set_persistent_access_phase_token_secret(string? token_secret) {
-        host.set_config_string("token_secret", token_secret);
-    } 
-
-    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
-    
-    /**
-     * Action that shows the authentication pane.
-     *
-     * This action method shows the authentication pane. It is shown at the
-     * very beginning of the interaction when no persistent parameters are found
-     * or after a failed login attempt using persisted parameters. It can be
-     * given a mode flag to specify whether it should be displayed in initial
-     * mode or in any of the error modes that it supports.
-     *
-     * @param mode the mode for the authentication pane
-     */
-    private void do_show_authentication_pane(AuthenticationPane.Mode mode = AuthenticationPane.Mode.INTRO) {
-        debug("ACTION: installing authentication pane");
-
-        host.set_service_locked(false);
-        AuthenticationPane authentication_pane =
-            new AuthenticationPane(this, mode);
-        authentication_pane.login.connect(on_authentication_pane_login_clicked);
-        host.install_dialog_pane(authentication_pane, Spit.Publishing.PluginHost.ButtonMode.CLOSE);
-        host.set_dialog_default_widget(authentication_pane.get_default_widget()); 
-    } 
-
-    /**
-     * Event triggered when the login button in the authentication panel is
-     * clicked.
-     *
-     * This event is triggered when the login button in the authentication
-     * panel is clicked. It then triggers a network login interaction.
-     *
-     * @param username the name of the Tumblr user as entered in the dialog
-     * @param password the password of the Tumblr as entered in the dialog
-     */
-    private void on_authentication_pane_login_clicked( string username, string password ) {
-        debug("EVENT: on_authentication_pane_login_clicked");
-        if (!running)
-            return;
-
-        do_network_login(username, password); 
-    }
-    
-    /**
-     * Action to perform a network login to a Tumblr blog.
-     *
-     * This action performs a network login a Tumblr blog specified the given user name and password as credentials.
-     *
-     * @param username the name of the Tumblr user used to login
-     * @param password the password of the Tumblr user used to login
-     */
-    private void do_network_login(string username, string password) {
-        debug("ACTION: logging in");
-        host.set_service_locked(true);
-        host.install_login_wait_pane();
-        
-
-        AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session,username,password);
-        txn.completed.connect(on_auth_request_txn_completed);
-        txn.network_error.connect(on_auth_request_txn_error);
-       
-        try {
-            txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-    }
-      
-
-    private void on_auth_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_auth_request_txn_completed);
-        txn.network_error.disconnect(on_auth_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: OAuth authentication request transaction completed; response = '%s'",
-            txn.get_response());
-
-        do_parse_token_info_from_auth_request(txn.get_response());
-    }
-
-    private void on_auth_request_txn_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_auth_request_txn_completed);
-        txn.network_error.disconnect(on_auth_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: OAuth authentication request transaction caused a network error");
-        host.post_error(err);
-    }
-
-
-    private void do_parse_token_info_from_auth_request(string response) {
-        debug("ACTION: parsing authorization request response '%s' into token and secret", response);
-        
-        string? oauth_token = null;
-        string? oauth_token_secret = null;
-        
-        string[] key_value_pairs = response.split("&");
-        foreach (string pair in key_value_pairs) {
-            string[] split_pair = pair.split("=");
-            
-            if (split_pair.length != 2)
-                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                    _("“%s” isn’t a valid response to an OAuth authentication request"), response));
-
-            if (split_pair[0] == "oauth_token")
-                oauth_token = split_pair[1];
-            else if (split_pair[0] == "oauth_token_secret")
-                oauth_token_secret = split_pair[1];
-        }
-        
-        if (oauth_token == null || oauth_token_secret == null)
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                _("“%s” isn’t a valid response to an OAuth authentication request"), response));
-        
-        session.set_access_phase_credentials(oauth_token, oauth_token_secret);
-    }
-
-
-
-    private void on_session_authenticated() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: a fully authenticated session has become available");             
-        set_persistent_access_phase_token(session.get_access_phase_token());
-        set_persistent_access_phase_token_secret(session.get_access_phase_token_secret());
-		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");
-
-        session.deauthenticate();
-        invalidate_persistent_session();
-
-        running = false;
-
-        attempt_start();
-    } 
-
-    public void attempt_start() {
-        if (is_running())
-            return;
-        
-        debug("TumblrPublisher: starting interaction.");
-        
-        running = true;
-        if (is_persistent_session_valid()) {
-            debug("attempt start: a persistent session is available; using it");
-
-            session.authenticate_from_persistent_credentials(get_persistent_access_phase_token(),
-                get_persistent_access_phase_token_secret());
-        } else {
-            debug("attempt start: no persistent session available; showing login welcome pane");
-
-            do_show_authentication_pane();
-        }
-    }
-
-    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 authentication pane used when asking service URL, user name and password
- * from the user.
- */
-internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
-    public enum Mode {
-        INTRO,
-        FAILED_RETRY_USER
-    }
-    private static string INTRO_MESSAGE = _("Enter the username and password associated with your Tumblr account.");
-    private static string FAILED_RETRY_USER_MESSAGE = _("Username and/or password invalid. Please try again");
-
-    private Gtk.Box pane_widget = null;
-    private Gtk.Builder builder;
-    private Gtk.Entry username_entry;
-    private Gtk.Entry password_entry;
-    private Gtk.Button login_button;
-
-    public signal void login(string user, string password);
-
-    public AuthenticationPane(TumblrPublisher publisher, Mode mode = Mode.INTRO) {
-        this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-
-        try {
-            builder = new Gtk.Builder();
-            builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui");
-            builder.connect_signals(null);
-            var content = builder.get_object ("content") as Gtk.Widget;
-            
-            Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
-            switch (mode) {
-                case Mode.INTRO:
-                    message_label.set_text(INTRO_MESSAGE);
-                    break;
-
-                case Mode.FAILED_RETRY_USER:
-                    message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
-                        "Invalid User Name or Password"), FAILED_RETRY_USER_MESSAGE));
-                    break;
-            }
-
-            username_entry = builder.get_object ("username_entry") as Gtk.Entry;
-
-            password_entry = builder.get_object ("password_entry") as Gtk.Entry;
-    
-
-
-            login_button = builder.get_object("login_button") as Gtk.Button;
-
-            username_entry.changed.connect(on_user_changed);
-            password_entry.changed.connect(on_password_changed);
-            login_button.clicked.connect(on_login_button_clicked);
-
-            content.parent.remove (content);
-            pane_widget.add (content);
-            publisher.get_host().set_dialog_default_widget(login_button);
-        } catch (Error e) {
-            warning(_("Could not load UI: %s"), e.message);
-        }
-    }
-    
-    public Gtk.Widget get_default_widget() {
-        return login_button;
-    }
-
-    private void on_login_button_clicked() {
-        login(username_entry.get_text(),
-            password_entry.get_text());
-    }
-
-
-    private void on_user_changed() {
-        update_login_button_sensitivity();
-    }
-
-    private void on_password_changed() {
-        update_login_button_sensitivity();
-    }
-    
-    private void update_login_button_sensitivity() {
-        login_button.set_sensitive(username_entry.text_length > 0 &&
-                                   password_entry.text_length > 0);
-    }
-    
-    public Gtk.Widget get_widget() {
-        return pane_widget;
-    }
-    
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-    }
-    
-    public void on_pane_installed() {
-        username_entry.grab_focus();
-        password_entry.set_activates_default(true);
-        login_button.can_default = true;
-        update_login_button_sensitivity();
-    }
-    
-    public void on_pane_uninstalled() {
-    }
-}
-
-
-/**
- * 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);
-    }
-}
-
-
-// REST support classes
-internal class Transaction : Publishing.RESTSupport.Transaction {
-    public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
-        Publishing.RESTSupport.HttpMethod.POST) {
-        base(session, method);
-        
-    }
-
-    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_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", API_KEY);
-		if (session.get_access_phase_token() != null) {
-            add_argument("oauth_token", session.get_access_phase_token());
-        }
-    } 
-
-    public override void execute() throws Spit.Publishing.PublishingError {
-        ((Session) get_parent_session()).sign_transaction(this);
-        
-        base.execute();
-    }
-
-}
-
-
-internal class AccessTokenFetchTransaction : Transaction {
-    public AccessTokenFetchTransaction(Session session, string username, string password) {
-        base.with_uri(session, "https://www.tumblr.com/oauth/access_token",
-            Publishing.RESTSupport.HttpMethod.POST);
-        add_argument("x_auth_username", Soup.URI.encode(username, ENCODE_RFC_3986_EXTRA));
-        add_argument("x_auth_password", password);
-        add_argument("x_auth_mode", "client_auth");
-    }
-}
-
-internal class UserInfoFetchTransaction : Transaction {
-    public UserInfoFetchTransaction(Session session) {
-        base.with_uri(session, "https://api.tumblr.com/v2/user/info",
-            Publishing.RESTSupport.HttpMethod.POST);
-    }
-}
-
-
-internal class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
-    private Session session;
-    private Publishing.RESTSupport.Argument[] auth_header_fields;
-
-
-//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(Session session,Spit.Publishing.Publishable publishable, string blog_url)  {
-		debug("Init upload transaction");
-        base.with_endpoint_url(session, publishable,"https://api.tumblr.com/v2/blog/%s/post".printf(blog_url) );
-        this.session = session;
-
-    }
-    
-
-  
-    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 {
-        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_timestamp", session.get_oauth_timestamp());
-        add_authorization_header_field("oauth_consumer_key", API_KEY);
-        add_authorization_header_field("oauth_token", session.get_access_phase_token());
-
-
-        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"));
-
-		}
-
-
-        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);
-        
-        Publishing.RESTSupport.Argument[] request_arguments = get_arguments();
-        assert(request_arguments.length > 0);
-
-		string request_data = "";
-		for (int i = 0; i < request_arguments.length; i++) {
-		        request_data += (request_arguments[i].key + "=" + request_arguments[i].value);
-		        if (i < request_arguments.length - 1)
-		            request_data += "&";
-		 }
-        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(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((Session) get_session(), get_current_publishable(), this.blog_url);
-
-    }
-}
-
-/**
- * Session class that keeps track of the authentication status and of the
- * user token tumblr.
- */
-internal class Session : Publishing.RESTSupport.Session {
-    private string? access_phase_token = null;
-    private string? access_phase_token_secret = null;
-
-
-    public Session() {
-        base(ENDPOINT_URL);
-    }
-
-    public override bool is_authenticated() {
-        return (access_phase_token != null && access_phase_token_secret != null);
-    }
-
-    public void authenticate_from_persistent_credentials(string token, string secret) {
-        this.access_phase_token = token;
-        this.access_phase_token_secret = secret;
-
-        
-        authenticated();
-    }
-    
-    public void deauthenticate() {
-        access_phase_token = null;
-        access_phase_token_secret = null;
-    } 
-    
-    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);
-		string? signing_key = null;
-        if (access_phase_token_secret != null) {
-            debug("access phase token secret available; using it as signing key");
-
-            signing_key = API_SECRET + "&" + this.get_access_phase_token_secret();
-        } else {
-            debug("Access phase token secret not available; using API " +
-                "key as signing key");
-
-            signing_key = API_SECRET + "&";
-        }
-
-
-        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 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 = Publishing.RESTSupport.hmac_sha1(signing_key, signature_base_string);
-        debug("signature = '%s'", signature);
-        signature = Soup.URI.encode(signature, ENCODE_RFC_3986_EXTRA);
-
-        debug("signature after RFC encode = '%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) {
-        this.access_phase_token = token;
-        this.access_phase_token_secret = secret;
-
-        
-        authenticated();
-    } 
-
-    public string get_access_phase_token() {
-        return access_phase_token;
-    }
-
-
-    public string get_access_phase_token_secret() {
-        return access_phase_token_secret;
-    }
-
-    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);
-    }
-
-}
-
-
-} //class TumblrPublisher
-
-} //namespace Publishing.Tumblr
-
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 492f100..8a81c99 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -1,4 +1,4 @@
-/* YandexPublishing.c generated by valac 0.36.6, the Vala compiler
+/* YandexPublishing.c generated by valac 0.40.4, the Vala compiler
  * generated from YandexPublishing.vala, do not modify */
 
 /* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>
@@ -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>
@@ -37,6 +38,11 @@
 typedef struct _YandexService YandexService;
 typedef struct _YandexServiceClass YandexServiceClass;
 typedef struct _YandexServicePrivate YandexServicePrivate;
+enum  {
+	YANDEX_SERVICE_0_PROPERTY,
+	YANDEX_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* yandex_service_properties[YANDEX_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER (publishing_yandex_yandex_publisher_get_type ())
@@ -82,6 +88,11 @@ typedef struct _PublishingYandexSessionPrivate PublishingYandexSessionPrivate;
 typedef struct _PublishingYandexWebAuthPane PublishingYandexWebAuthPane;
 typedef struct _PublishingYandexWebAuthPaneClass PublishingYandexWebAuthPaneClass;
 typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePrivate;
+enum  {
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_0_PROPERTY,
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_yandex_web_auth_pane_properties[PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_PROPERTIES];
 #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -90,9 +101,9 @@ typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePr
 enum  {
 	PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL,
 	PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL,
-	PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_SIGNALS
 };
-static guint publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL] = {0};
+static guint publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS (publishing_yandex_publish_options_get_type ())
 #define PUBLISHING_YANDEX_PUBLISH_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions))
@@ -117,11 +128,16 @@ typedef struct _PublishingYandexPublishingOptionsPane PublishingYandexPublishing
 typedef struct _PublishingYandexPublishingOptionsPaneClass PublishingYandexPublishingOptionsPaneClass;
 typedef struct _PublishingYandexPublishingOptionsPanePrivate PublishingYandexPublishingOptionsPanePrivate;
 enum  {
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_yandex_publishing_options_pane_properties[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
+enum  {
 	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
 	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_YANDEX_TYPE_UPLOADER (publishing_yandex_uploader_get_type ())
 #define PUBLISHING_YANDEX_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader))
@@ -148,6 +164,11 @@ typedef struct _PublishingYandexUploadTransactionPrivate PublishingYandexUploadT
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 #define __vala_SoupBuffer_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupBuffer_free (var), NULL)))
 typedef struct _PublishingYandexYandexPublisherPrivate PublishingYandexYandexPublisherPrivate;
+enum  {
+	PUBLISHING_YANDEX_YANDEX_PUBLISHER_0_PROPERTY,
+	PUBLISHING_YANDEX_YANDEX_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_yandex_yandex_publisher_properties[PUBLISHING_YANDEX_YANDEX_PUBLISHER_NUM_PROPERTIES];
 #define _publishing_yandex_publish_options_unref0(var) ((var == NULL) ? NULL : (var = (publishing_yandex_publish_options_unref (var), NULL)))
 #define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
 #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
@@ -300,185 +321,257 @@ static gpointer publishing_yandex_yandex_publisher_parent_class = NULL;
 static SpitPublishingPublisherIface * publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL;
 
 GType yandex_service_get_type (void) G_GNUC_CONST;
-enum  {
-	YANDEX_SERVICE_DUMMY_PROPERTY
-};
-static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                  gint min_host_interface,
+                                                  gint max_host_interface);
 static const gchar* yandex_service_real_get_id (SpitPluggable* base);
 static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base);
-static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void yandex_service_real_get_info (SpitPluggable* base,
+                                   SpitPluggableInfo* info);
+static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base,
+                                                               SpitPublishingPluginHost* host);
+PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service,
+                                                                         SpitPublishingPluginHost* host);
+PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type,
+                                                                               SpitPublishingService* service,
+                                                                               SpitPublishingPluginHost* host);
 GType publishing_yandex_yandex_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media (SpitPublishingService* base);
-static void yandex_service_real_activation (SpitPluggable* base, gboolean enabled);
+static void yandex_service_real_activation (SpitPluggable* base,
+                                     gboolean enabled);
 YandexService* yandex_service_new (void);
 YandexService* yandex_service_construct (GType object_type);
 #define PUBLISHING_YANDEX_SERVICE_NAME "Yandex.Fotki"
 #define PUBLISHING_YANDEX_client_id "52be4756dee3438792c831a75d7cd360"
 GType publishing_yandex_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_YANDEX_TRANSACTION_DUMMY_PROPERTY
-};
 GType publishing_yandex_session_get_type (void) G_GNUC_CONST;
-PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method);
-PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type, PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method);
+PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session,
+                                                                         const gchar* url,
+                                                                         PublishingRESTSupportHttpMethod method);
+PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type,
+                                                                               PublishingYandexSession* session,
+                                                                               const gchar* url,
+                                                                               PublishingRESTSupportHttpMethod method);
 static void publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self);
 gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self);
-PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method);
-PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingRESTSupportHttpMethod method);
-void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, const gchar* type, const gchar* data);
+PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session,
+                                                                PublishingRESTSupportHttpMethod method);
+PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type,
+                                                                      PublishingYandexSession* session,
+                                                                      PublishingRESTSupportHttpMethod method);
+void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
+                                             const gchar* type,
+                                             const gchar* data);
 #define PUBLISHING_YANDEX_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSessionPrivate))
-enum  {
-	PUBLISHING_YANDEX_SESSION_DUMMY_PROPERTY
-};
 PublishingYandexSession* publishing_yandex_session_new (void);
 PublishingYandexSession* publishing_yandex_session_construct (GType object_type);
 static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base);
 void publishing_yandex_session_deauthenticate (PublishingYandexSession* self);
-void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token);
+void publishing_yandex_session_set_auth_token (PublishingYandexSession* self,
+                                               const gchar* token);
 static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj);
 GType publishing_yandex_web_auth_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPanePrivate))
-enum  {
-	PUBLISHING_YANDEX_WEB_AUTH_PANE_DUMMY_PROPERTY
-};
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url);
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url);
+PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type,
+                                                                        const gchar* login_url);
 static void publishing_yandex_web_auth_pane_real_constructed (GObject* base);
-static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type);
-static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self);
+static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self,
+                                                           WebKitPolicyDecision* decision,
+                                                           WebKitPolicyDecisionType type);
+static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender,
+                                                                                          WebKitPolicyDecision* decision,
+                                                                                          WebKitPolicyDecisionType type,
+                                                                                          gpointer self);
 static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
 static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self);
 static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self);
 static void publishing_yandex_web_auth_pane_finalize (GObject * obj);
 gpointer publishing_yandex_publish_options_ref (gpointer instance);
 void publishing_yandex_publish_options_unref (gpointer instance);
-GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object);
-void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object);
+GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name,
+                                                          const gchar* nick,
+                                                          const gchar* blurb,
+                                                          GType object_type,
+                                                          GParamFlags flags);
+void publishing_yandex_value_set_publish_options (GValue* value,
+                                                  gpointer v_object);
+void publishing_yandex_value_take_publish_options (GValue* value,
+                                                   gpointer v_object);
 gpointer publishing_yandex_value_get_publish_options (const GValue* value);
 GType publishing_yandex_publish_options_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_YANDEX_PUBLISH_OPTIONS_DUMMY_PROPERTY
-};
 PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void);
 PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type);
 static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj);
 GType publishing_yandex_publishing_options_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
 static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
 static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host);
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type, PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host);
+PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options,
+                                                                                      GeeHashMap* list,
+                                                                                      SpitPublishingPluginHost* host);
+PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type,
+                                                                                            PublishingYandexPublishOptions* options,
+                                                                                            GeeHashMap* list,
+                                                                                            SpitPublishingPluginHost* host);
 static void publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self);
-static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                       gpointer self);
 static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self);
-static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                      gpointer self);
 static void publishing_yandex_publishing_options_pane_finalize (GObject * obj);
 GType publishing_yandex_uploader_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploaderPrivate))
-enum  {
-	PUBLISHING_YANDEX_UPLOADER_DUMMY_PROPERTY
-};
-PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1);
-PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1);
-static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo);
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo);
+PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session,
+                                                          PublishingYandexPublishOptions* options,
+                                                          SpitPublishingPublishable** photos,
+                                                          int photos_length1);
+PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type,
+                                                                PublishingYandexSession* session,
+                                                                PublishingYandexPublishOptions* options,
+                                                                SpitPublishingPublishable** photos,
+                                                                int photos_length1);
+static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                                      SpitPublishingPublishable* publishable);
+PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session,
+                                                                             PublishingYandexPublishOptions* options,
+                                                                             SpitPublishingPublishable* photo);
+PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type,
+                                                                                   PublishingYandexSession* session,
+                                                                                   PublishingYandexPublishOptions* options,
+                                                                                   SpitPublishingPublishable* photo);
 GType publishing_yandex_upload_transaction_get_type (void) G_GNUC_CONST;
 static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
-enum  {
-	PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
 static void _vala_SoupMultipart_free (SoupMultipart* self);
 static void _g_free0_ (gpointer var);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 #define PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisherPrivate))
-enum  {
-	PUBLISHING_YANDEX_YANDEX_PUBLISHER_DUMMY_PROPERTY
-};
 gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self);
-void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token);
+void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self,
+                                                                   const gchar* auth_token);
 void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self);
 gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self);
 static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base);
 static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base);
-static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self, PublishingRESTSupportXmlDocument* doc);
-static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self, xmlNode* e, GError** error);
-void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self, const gchar* data, GError** error);
-static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self, const gchar* data, GError** error);
-static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err);
-static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t);
-static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self,
+                                                          PublishingRESTSupportXmlDocument* doc);
+static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self,
+                                                           xmlNode* e,
+                                                           GError** error);
+void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self,
+                                                              const gchar* data,
+                                                              GError** error);
+static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                                         gpointer self);
+void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self,
+                                                          const gchar* data,
+                                                          GError** error);
+static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self,
+                                                              PublishingRESTSupportTransaction* t,
+                                                              GError* err);
+static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self,
+                                                                 PublishingRESTSupportTransaction* t);
+static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                gpointer self);
+static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                 GError* err,
+                                                                                                                 gpointer self);
 static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self);
 static void publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self);
-static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self,
+                                                            PublishingRESTSupportBatchUploader* uploader,
+                                                            gint num_published);
+static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                    gint num_photos_published,
+                                                                                                                    gpointer self);
+static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self,
+                                                         PublishingRESTSupportBatchUploader* uploader,
+                                                         GError* err);
+static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                              GError* err,
+                                                                                                              gpointer self);
+static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self,
+                                                                  gint file_number,
+                                                                  gdouble completed_fraction);
+static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                     gdouble fraction_complete,
+                                                                                                     gpointer self);
 static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self);
 static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self);
-void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err);
-void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t);
-static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self);
-void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self, const gchar* url);
-void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err);
-void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t);
-static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self, const gchar* auth_token);
-static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self, const gchar* access_token);
+void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self,
+                                                                      PublishingRESTSupportTransaction* t,
+                                                                      GError* err);
+void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self,
+                                                                         PublishingRESTSupportTransaction* t);
+static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                        gpointer self);
+static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                         GError* err,
+                                                                                                                         gpointer self);
+static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender,
+                                                                                                       gpointer self);
+static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender,
+                                                                                                     gpointer self);
+void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self,
+                                                                const gchar* url);
+void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self,
+                                                             PublishingRESTSupportTransaction* t,
+                                                             GError* err);
+void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self,
+                                                                PublishingRESTSupportTransaction* t);
+static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                               gpointer self);
+static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                GError* err,
+                                                                                                                gpointer self);
+void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self,
+                                                                   const gchar* auth_token);
+static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self,
+                                                                  const gchar* access_token);
 static void publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self);
 static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self);
-static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self);
-static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self);
+static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender,
+                                                                                                                   const gchar* success_url,
+                                                                                                                   gpointer self);
+static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender,
+                                                                                                             gpointer self);
 static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self);
 static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self);
 static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base);
 static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base);
 static void publishing_yandex_yandex_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);
+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);
 
 
-static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+yandex_service_real_get_pluggable_interface (SpitPluggable* base,
+                                             gint min_host_interface,
+                                             gint max_host_interface)
+{
 	YandexService * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 478 "YandexPublishing.c"
+#line 569 "YandexPublishing.c"
 }
 
 
-static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+yandex_service_real_get_id (SpitPluggable* base)
+{
 	YandexService * self;
 	const gchar* result = NULL;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -487,11 +580,13 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.yandex-fotki";
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 491 "YandexPublishing.c"
+#line 584 "YandexPublishing.c"
 }
 
 
-static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+yandex_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	YandexService * self;
 	const gchar* result = NULL;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -500,11 +595,14 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Yandex.Fotki";
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 504 "YandexPublishing.c"
+#line 599 "YandexPublishing.c"
 }
 
 
-static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+yandex_service_real_get_info (SpitPluggable* base,
+                              SpitPluggableInfo* info)
+{
 	YandexService * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -561,32 +659,34 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	_g_free0 ((*info).license);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).license = _tmp6_;
-#line 565 "YandexPublishing.c"
+#line 663 "YandexPublishing.c"
 }
 
 
-static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+yandex_service_real_create_publisher (SpitPublishingService* base,
+                                      SpitPublishingPluginHost* host)
+{
 	YandexService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingYandexYandexPublisher* _tmp1_;
+	PublishingYandexYandexPublisher* _tmp0_;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = host;
+	_tmp0_ = publishing_yandex_yandex_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = publishing_yandex_yandex_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 586 "YandexPublishing.c"
+#line 684 "YandexPublishing.c"
 }
 
 
-static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+yandex_service_real_get_supported_media (SpitPublishingService* base)
+{
 	YandexService * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -595,43 +695,54 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 599 "YandexPublishing.c"
+#line 699 "YandexPublishing.c"
 }
 
 
-static void yandex_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+yandex_service_real_activation (SpitPluggable* base,
+                                gboolean enabled)
+{
 	YandexService * self;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 607 "YandexPublishing.c"
+#line 710 "YandexPublishing.c"
 }
 
 
-YandexService* yandex_service_construct (GType object_type) {
+YandexService*
+yandex_service_construct (GType object_type)
+{
 	YandexService * self = NULL;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (YandexService*) g_object_new (object_type, NULL);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 617 "YandexPublishing.c"
+#line 722 "YandexPublishing.c"
 }
 
 
-YandexService* yandex_service_new (void) {
+YandexService*
+yandex_service_new (void)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 624 "YandexPublishing.c"
+#line 731 "YandexPublishing.c"
 }
 
 
-static void yandex_service_class_init (YandexServiceClass * klass) {
+static void
+yandex_service_class_init (YandexServiceClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 631 "YandexPublishing.c"
+#line 740 "YandexPublishing.c"
 }
 
 
-static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+yandex_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -644,26 +755,32 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) yandex_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->activation = (void (*) (SpitPluggable *, gboolean)) yandex_service_real_activation;
-#line 648 "YandexPublishing.c"
+#line 759 "YandexPublishing.c"
 }
 
 
-static void yandex_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+yandex_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) yandex_service_real_get_supported_media;
-#line 659 "YandexPublishing.c"
+#line 772 "YandexPublishing.c"
 }
 
 
-static void yandex_service_instance_init (YandexService * self) {
+static void
+yandex_service_instance_init (YandexService * self)
+{
 }
 
 
-GType yandex_service_get_type (void) {
+GType
+yandex_service_get_type (void)
+{
 	static volatile gsize yandex_service_type_id__volatile = 0;
 	if (g_once_init_enter (&yandex_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (YandexServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) yandex_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (YandexService), 0, (GInstanceInitFunc) yandex_service_instance_init, NULL };
@@ -679,43 +796,44 @@ GType yandex_service_get_type (void) {
 }
 
 
-PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type, PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_construct_with_url (GType object_type,
+                                                  PublishingYandexSession* session,
+                                                  const gchar* url,
+                                                  PublishingRESTSupportHttpMethod method)
+{
 	PublishingYandexTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportHttpMethod _tmp2_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = session;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = url;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = method;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+	self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, method);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_add_headers (self);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 704 "YandexPublishing.c"
+#line 817 "YandexPublishing.c"
 }
 
 
-PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_new_with_url (PublishingYandexSession* session,
+                                            const gchar* url,
+                                            PublishingRESTSupportHttpMethod method)
+{
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 711 "YandexPublishing.c"
+#line 828 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self) {
+static void
+publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self)
+{
 	PublishingRESTSupportSession* _tmp0_;
 	PublishingYandexSession* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self));
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -725,75 +843,76 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	if (_tmp3_) {
-#line 734 "YandexPublishing.c"
-		PublishingRESTSupportSession* _tmp4_;
-		PublishingYandexSession* _tmp5_;
+	if (_tmp2_) {
+#line 850 "YandexPublishing.c"
+		PublishingRESTSupportSession* _tmp3_;
+		PublishingYandexSession* _tmp4_;
+		gchar* _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
-		gchar* _tmp9_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp4_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+		_tmp3_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = publishing_yandex_session_get_auth_token (_tmp5_);
+		_tmp5_ = publishing_yandex_session_get_auth_token (_tmp4_);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp8_ = g_strdup_printf ("OAuth %s", _tmp7_);
+		_tmp7_ = g_strdup_printf ("OAuth %s", _tmp6_);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp9_);
+		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp8_);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp8_);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_publishing_rest_support_session_unref0 (_tmp5_);
+		_publishing_rest_support_session_unref0 (_tmp4_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 763 "YandexPublishing.c"
+#line 879 "YandexPublishing.c"
 	}
 }
 
 
-PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_construct (GType object_type,
+                                         PublishingYandexSession* session,
+                                         PublishingRESTSupportHttpMethod method)
+{
 	PublishingYandexTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = session;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = method;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
+	self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), method);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_add_headers (self);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 784 "YandexPublishing.c"
+#line 898 "YandexPublishing.c"
 }
 
 
-PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_new (PublishingYandexSession* session,
+                                   PublishingRESTSupportHttpMethod method)
+{
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 791 "YandexPublishing.c"
+#line 908 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, const gchar* type, const gchar* data) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
+void
+publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
+                                        const gchar* type,
+                                        const gchar* data)
+{
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self));
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -801,27 +920,29 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (data != NULL);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = data;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = type;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 810 "YandexPublishing.c"
+	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), data, type, (gulong) 0);
+#line 925 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
+static void
+publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass)
+{
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 817 "YandexPublishing.c"
+#line 934 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_transaction_instance_init (PublishingYandexTransaction * self) {
+static void
+publishing_yandex_transaction_instance_init (PublishingYandexTransaction * self)
+{
 }
 
 
-GType publishing_yandex_transaction_get_type (void) {
+GType
+publishing_yandex_transaction_get_type (void)
+{
 	static volatile gsize publishing_yandex_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexTransaction), 0, (GInstanceInitFunc) publishing_yandex_transaction_instance_init, NULL };
@@ -833,24 +954,30 @@ GType publishing_yandex_transaction_get_type (void) {
 }
 
 
-PublishingYandexSession* publishing_yandex_session_construct (GType object_type) {
+PublishingYandexSession*
+publishing_yandex_session_construct (GType object_type)
+{
 	PublishingYandexSession* self = NULL;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 843 "YandexPublishing.c"
+#line 966 "YandexPublishing.c"
 }
 
 
-PublishingYandexSession* publishing_yandex_session_new (void) {
+PublishingYandexSession*
+publishing_yandex_session_new (void)
+{
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 850 "YandexPublishing.c"
+#line 975 "YandexPublishing.c"
 }
 
 
-static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
 	PublishingYandexSession * self;
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
@@ -862,41 +989,45 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
 	result = _tmp0_ != NULL;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 866 "YandexPublishing.c"
+#line 993 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
+void
+publishing_yandex_session_deauthenticate (PublishingYandexSession* self)
+{
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_SESSION (self));
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->priv->auth_token);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 877 "YandexPublishing.c"
+#line 1006 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_yandex_session_set_auth_token (PublishingYandexSession* self,
+                                          const gchar* token)
+{
+	gchar* _tmp0_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_SESSION (self));
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (token != NULL);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = token;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (token);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->priv->auth_token);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->auth_token = _tmp1_;
-#line 896 "YandexPublishing.c"
+	self->priv->auth_token = _tmp0_;
+#line 1025 "YandexPublishing.c"
 }
 
 
-gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self) {
+gchar*
+publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -910,11 +1041,13 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
 	result = _tmp1_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 914 "YandexPublishing.c"
+#line 1045 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_session_class_init (PublishingYandexSessionClass * klass) {
+static void
+publishing_yandex_session_class_init (PublishingYandexSessionClass * klass)
+{
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_session_parent_class = g_type_class_peek_parent (klass);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -923,20 +1056,24 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
 	g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate));
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_yandex_session_real_is_authenticated;
-#line 927 "YandexPublishing.c"
+#line 1060 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_session_instance_init (PublishingYandexSession * self) {
+static void
+publishing_yandex_session_instance_init (PublishingYandexSession * self)
+{
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 936 "YandexPublishing.c"
+#line 1071 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_yandex_session_finalize (PublishingRESTSupportSession * obj)
+{
 	PublishingYandexSession * self;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
@@ -944,11 +1081,13 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession * o
 	_g_free0 (self->priv->auth_token);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 948 "YandexPublishing.c"
+#line 1085 "YandexPublishing.c"
 }
 
 
-GType publishing_yandex_session_get_type (void) {
+GType
+publishing_yandex_session_get_type (void)
+{
 	static volatile gsize publishing_yandex_session_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_session_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexSession), 0, (GInstanceInitFunc) publishing_yandex_session_instance_init, NULL };
@@ -960,45 +1099,54 @@ GType publishing_yandex_session_get_type (void) {
 }
 
 
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
+PublishingYandexWebAuthPane*
+publishing_yandex_web_auth_pane_construct (GType object_type,
+                                           const gchar* login_url)
+{
 	PublishingYandexWebAuthPane * self = NULL;
-	const gchar* _tmp0_;
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (login_url != NULL, NULL);
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = login_url;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
+	self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", login_url, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 975 "YandexPublishing.c"
+#line 1114 "YandexPublishing.c"
 }
 
 
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
+PublishingYandexWebAuthPane*
+publishing_yandex_web_auth_pane_new (const gchar* login_url)
+{
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 982 "YandexPublishing.c"
+#line 1123 "YandexPublishing.c"
 }
 
 
-static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self) {
+static gboolean
+_publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender,
+                                                                                 WebKitPolicyDecision* decision,
+                                                                                 WebKitPolicyDecisionType type,
+                                                                                 gpointer self)
+{
 	gboolean result;
 	result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 991 "YandexPublishing.c"
+#line 1137 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
+static void
+publishing_yandex_web_auth_pane_real_constructed (GObject* base)
+{
 	PublishingYandexWebAuthPane * self;
 	WebKitWebView* _tmp3_;
 	WebKitWebView* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1002 "YandexPublishing.c"
+#line 1150 "YandexPublishing.c"
 	{
 		GRegex* _tmp0_ = NULL;
 		GRegex* _tmp1_;
@@ -1011,8 +1159,8 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1015 "YandexPublishing.c"
-				goto __catch39_g_regex_error;
+#line 1163 "YandexPublishing.c"
+				goto __catch32_g_regex_error;
 			}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1020,7 +1168,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 			g_clear_error (&_inner_error_);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 1024 "YandexPublishing.c"
+#line 1172 "YandexPublishing.c"
 		}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = _tmp0_;
@@ -1032,10 +1180,10 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		self->priv->re = _tmp2_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_regex_unref0 (_tmp0_);
-#line 1036 "YandexPublishing.c"
+#line 1184 "YandexPublishing.c"
 	}
-	goto __finally39;
-	__catch39_g_regex_error:
+	goto __finally32;
+	__catch32_g_regex_error:
 	{
 		GError* e = NULL;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1046,9 +1194,9 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		g_assert_not_reached ();
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1050 "YandexPublishing.c"
+#line 1198 "YandexPublishing.c"
 	}
-	__finally39:
+	__finally32:
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1057,7 +1205,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		g_clear_error (&_inner_error_);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 1061 "YandexPublishing.c"
+#line 1209 "YandexPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
@@ -1067,179 +1215,183 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 	g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1071 "YandexPublishing.c"
+#line 1219 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
 	PublishingYandexWebAuthPane * self;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1079 "YandexPublishing.c"
+#line 1229 "YandexPublishing.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1086 "YandexPublishing.c"
+#line 1238 "YandexPublishing.c"
 }
 
 
-static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) {
+static WebKitNavigationAction*
+_vala_WebKitNavigationAction_copy (WebKitNavigationAction* self)
+{
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return g_boxed_copy (webkit_navigation_action_get_type (), self);
-#line 1093 "YandexPublishing.c"
+#line 1247 "YandexPublishing.c"
 }
 
 
-static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) {
+static gpointer
+__vala_WebKitNavigationAction_copy0 (gpointer self)
+{
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? _vala_WebKitNavigationAction_copy (self) : NULL;
-#line 1100 "YandexPublishing.c"
+#line 1256 "YandexPublishing.c"
 }
 
 
-static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) {
+static void
+_vala_WebKitNavigationAction_free (WebKitNavigationAction* self)
+{
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (webkit_navigation_action_get_type (), self);
-#line 1107 "YandexPublishing.c"
+#line 1265 "YandexPublishing.c"
 }
 
 
-static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type) {
+static gboolean
+publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self,
+                                                  WebKitPolicyDecision* decision,
+                                                  WebKitPolicyDecisionType type)
+{
 	gboolean result = FALSE;
-	WebKitPolicyDecisionType _tmp0_;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self), FALSE);
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (WEBKIT_IS_POLICY_DECISION (decision), FALSE);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = type;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	switch (_tmp0_) {
+	switch (type) {
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1124 "YandexPublishing.c"
+#line 1283 "YandexPublishing.c"
 		{
 			WebKitNavigationPolicyDecision* n_decision = NULL;
-			WebKitPolicyDecision* _tmp1_;
-			WebKitNavigationPolicyDecision* _tmp2_;
+			WebKitNavigationPolicyDecision* _tmp0_;
 			WebKitNavigationAction* action = NULL;
-			WebKitNavigationPolicyDecision* _tmp3_;
+			WebKitNavigationPolicyDecision* _tmp1_;
+			WebKitNavigationAction* _tmp2_;
+			WebKitNavigationAction* _tmp3_;
 			WebKitNavigationAction* _tmp4_;
-			WebKitNavigationAction* _tmp5_;
-			WebKitNavigationAction* _tmp6_;
 			gchar* uri = NULL;
-			WebKitNavigationAction* _tmp7_;
-			WebKitURIRequest* _tmp8_;
-			const gchar* _tmp9_;
+			WebKitNavigationAction* _tmp5_;
+			WebKitURIRequest* _tmp6_;
+			const gchar* _tmp7_;
+			const gchar* _tmp8_;
+			gchar* _tmp9_;
 			const gchar* _tmp10_;
-			gchar* _tmp11_;
-			const gchar* _tmp12_;
 			GMatchInfo* info = NULL;
-			GRegex* _tmp13_;
-			const gchar* _tmp14_;
-			GMatchInfo* _tmp15_ = NULL;
-			gboolean _tmp16_;
-			WebKitPolicyDecision* _tmp28_;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp1_ = decision;
+			GRegex* _tmp11_;
+			const gchar* _tmp12_;
+			GMatchInfo* _tmp13_ = NULL;
+			gboolean _tmp14_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, webkit_navigation_policy_decision_get_type (), WebKitNavigationPolicyDecision));
+			_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (decision, webkit_navigation_policy_decision_get_type (), WebKitNavigationPolicyDecision));
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			n_decision = _tmp2_;
+			n_decision = _tmp0_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp3_ = n_decision;
+			_tmp1_ = n_decision;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp4_ = webkit_navigation_policy_decision_get_navigation_action (_tmp3_);
+			_tmp2_ = webkit_navigation_policy_decision_get_navigation_action (_tmp1_);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp5_ = _tmp4_;
+			_tmp3_ = _tmp2_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp6_ = __vala_WebKitNavigationAction_copy0 (_tmp5_);
+			_tmp4_ = __vala_WebKitNavigationAction_copy0 (_tmp3_);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			action = _tmp6_;
+			action = _tmp4_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp7_ = action;
+			_tmp5_ = action;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp8_ = webkit_navigation_action_get_request (_tmp7_);
+			_tmp6_ = webkit_navigation_action_get_request (_tmp5_);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp9_ = webkit_uri_request_get_uri (_tmp8_);
+			_tmp7_ = webkit_uri_request_get_uri (_tmp6_);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp10_ = _tmp9_;
+			_tmp8_ = _tmp7_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp11_ = g_strdup (_tmp10_);
+			_tmp9_ = g_strdup (_tmp8_);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			uri = _tmp11_;
+			uri = _tmp9_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp12_ = uri;
+			_tmp10_ = uri;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			g_debug ("YandexPublishing.vala:126: Navigating to '%s'", _tmp12_);
+			g_debug ("YandexPublishing.vala:126: Navigating to '%s'", _tmp10_);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			info = NULL;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp13_ = self->priv->re;
+			_tmp11_ = self->priv->re;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp14_ = uri;
+			_tmp12_ = uri;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp16_ = g_regex_match (_tmp13_, _tmp14_, 0, &_tmp15_);
+			_tmp14_ = g_regex_match (_tmp11_, _tmp12_, 0, &_tmp13_);
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_match_info_unref0 (info);
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			info = _tmp15_;
+			info = _tmp13_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			if (_tmp16_) {
-#line 1193 "YandexPublishing.c"
+			if (_tmp14_) {
+#line 1348 "YandexPublishing.c"
 				gchar* access_token = NULL;
-				GMatchInfo* _tmp17_;
+				GMatchInfo* _tmp15_;
+				gchar** _tmp16_;
+				gchar** _tmp17_;
 				gchar** _tmp18_;
-				gchar** _tmp19_;
-				gchar** _tmp20_;
-				gint _tmp20__length1;
-				const gchar* _tmp21_;
-				gchar* _tmp22_;
-				gchar* _tmp23_;
-				const gchar* _tmp24_;
-				const gchar* _tmp25_;
+				gint _tmp18__length1;
+				const gchar* _tmp19_;
+				gchar* _tmp20_;
+				gchar* _tmp21_;
+				const gchar* _tmp22_;
+				const gchar* _tmp23_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp17_ = info;
+				_tmp15_ = info;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp19_ = _tmp18_ = g_match_info_fetch_all (_tmp17_);
+				_tmp17_ = _tmp16_ = g_match_info_fetch_all (_tmp15_);
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp20_ = _tmp19_;
+				_tmp18_ = _tmp17_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp20__length1 = _vala_array_length (_tmp18_);
+				_tmp18__length1 = _vala_array_length (_tmp16_);
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp21_ = _tmp20_[2];
+				_tmp19_ = _tmp18_[2];
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp22_ = g_strdup (_tmp21_);
+				_tmp20_ = g_strdup (_tmp19_);
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp23_ = _tmp22_;
+				_tmp21_ = _tmp20_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_free), NULL);
+				_tmp18_ = (_vala_array_free (_tmp18_, _tmp18__length1, (GDestroyNotify) g_free), NULL);
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				access_token = _tmp23_;
+				access_token = _tmp21_;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp24_ = access_token;
+				_tmp22_ = access_token;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				g_debug ("YandexPublishing.vala:133: Load completed: %s", _tmp24_);
+				g_debug ("YandexPublishing.vala:133: Load completed: %s", _tmp22_);
 #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				shotwell_plugins_common_web_authentication_pane_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane), GDK_LEFT_PTR);
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp25_ = access_token;
+				_tmp23_ = access_token;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (_tmp25_ != NULL) {
-#line 1233 "YandexPublishing.c"
-					const gchar* _tmp26_;
-					WebKitPolicyDecision* _tmp27_;
+				if (_tmp23_ != NULL) {
+#line 1388 "YandexPublishing.c"
+					const gchar* _tmp24_;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp26_ = access_token;
+					_tmp24_ = access_token;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp26_);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp27_ = decision;
+					g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp24_);
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					webkit_policy_decision_ignore (_tmp27_);
+					webkit_policy_decision_ignore (decision);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (access_token);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1252,20 +1404,18 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 					_g_object_unref0 (n_decision);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1256 "YandexPublishing.c"
+#line 1408 "YandexPublishing.c"
 				} else {
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL], 0);
-#line 1260 "YandexPublishing.c"
+#line 1412 "YandexPublishing.c"
 				}
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (access_token);
-#line 1264 "YandexPublishing.c"
+#line 1416 "YandexPublishing.c"
 			}
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp28_ = decision;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			webkit_policy_decision_use (_tmp28_);
+			webkit_policy_decision_use (decision);
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_match_info_unref0 (info);
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1276,20 +1426,17 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			_g_object_unref0 (n_decision);
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1280 "YandexPublishing.c"
+#line 1430 "YandexPublishing.c"
 		}
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1284 "YandexPublishing.c"
+#line 1434 "YandexPublishing.c"
 		{
-			WebKitPolicyDecision* _tmp29_;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp29_ = decision;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			webkit_policy_decision_use (_tmp29_);
+			webkit_policy_decision_use (decision);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1293 "YandexPublishing.c"
+#line 1440 "YandexPublishing.c"
 		}
 		default:
 		{
@@ -1297,18 +1444,20 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			result = FALSE;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return result;
-#line 1301 "YandexPublishing.c"
+#line 1448 "YandexPublishing.c"
 		}
 	}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = TRUE;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1308 "YandexPublishing.c"
+#line 1455 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthPaneClass * klass) {
+static void
+publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthPaneClass * klass)
+{
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_web_auth_pane_parent_class = g_type_class_peek_parent (klass);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1323,18 +1472,22 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP
 	publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL] = g_signal_new ("login-succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL] = g_signal_new ("login-failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1327 "YandexPublishing.c"
+#line 1476 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
+static void
+publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self)
+{
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
-#line 1334 "YandexPublishing.c"
+#line 1485 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_web_auth_pane_finalize (GObject * obj) {
+static void
+publishing_yandex_web_auth_pane_finalize (GObject * obj)
+{
 	PublishingYandexWebAuthPane * self;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
@@ -1342,11 +1495,13 @@ static void publishing_yandex_web_auth_pane_finalize (GObject * obj) {
 	_g_regex_unref0 (self->priv->re);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj);
-#line 1346 "YandexPublishing.c"
+#line 1499 "YandexPublishing.c"
 }
 
 
-GType publishing_yandex_web_auth_pane_get_type (void) {
+GType
+publishing_yandex_web_auth_pane_get_type (void)
+{
 	static volatile gsize publishing_yandex_web_auth_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_web_auth_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexWebAuthPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_web_auth_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexWebAuthPane), 0, (GInstanceInitFunc) publishing_yandex_web_auth_pane_instance_init, NULL };
@@ -1358,121 +1513,150 @@ GType publishing_yandex_web_auth_pane_get_type (void) {
 }
 
 
-PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type) {
+PublishingYandexPublishOptions*
+publishing_yandex_publish_options_construct (GType object_type)
+{
 	PublishingYandexPublishOptions* self = NULL;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1368 "YandexPublishing.c"
+#line 1525 "YandexPublishing.c"
 }
 
 
-PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) {
+PublishingYandexPublishOptions*
+publishing_yandex_publish_options_new (void)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS);
-#line 1375 "YandexPublishing.c"
+#line 1534 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_value_publish_options_init (GValue* value) {
+static void
+publishing_yandex_value_publish_options_init (GValue* value)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1382 "YandexPublishing.c"
+#line 1543 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_value_publish_options_free_value (GValue* value) {
+static void
+publishing_yandex_value_publish_options_free_value (GValue* value)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (value->data[0].v_pointer);
-#line 1391 "YandexPublishing.c"
+#line 1554 "YandexPublishing.c"
 	}
 }
 
 
-static void publishing_yandex_value_publish_options_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_yandex_value_publish_options_copy_value (const GValue* src_value,
+                                                    GValue* dest_value)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer);
-#line 1401 "YandexPublishing.c"
+#line 1567 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1405 "YandexPublishing.c"
+#line 1571 "YandexPublishing.c"
 	}
 }
 
 
-static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) {
+static gpointer
+publishing_yandex_value_publish_options_peek_pointer (const GValue* value)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1413 "YandexPublishing.c"
+#line 1581 "YandexPublishing.c"
 }
 
 
-static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_yandex_value_publish_options_collect_value (GValue* value,
+                                                       guint n_collect_values,
+                                                       GTypeCValue* collect_values,
+                                                       guint collect_flags)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1420 "YandexPublishing.c"
+#line 1593 "YandexPublishing.c"
 		PublishingYandexPublishOptions * object;
 		object = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1427 "YandexPublishing.c"
+#line 1600 "YandexPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1431 "YandexPublishing.c"
+#line 1604 "YandexPublishing.c"
 		}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = publishing_yandex_publish_options_ref (object);
-#line 1435 "YandexPublishing.c"
+#line 1608 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1439 "YandexPublishing.c"
+#line 1612 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1443 "YandexPublishing.c"
+#line 1616 "YandexPublishing.c"
 }
 
 
-static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_yandex_value_publish_options_lcopy_value (const GValue* value,
+                                                     guint n_collect_values,
+                                                     GTypeCValue* collect_values,
+                                                     guint collect_flags)
+{
 	PublishingYandexPublishOptions ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!object_p) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1454 "YandexPublishing.c"
+#line 1632 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = NULL;
-#line 1460 "YandexPublishing.c"
+#line 1638 "YandexPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1464 "YandexPublishing.c"
+#line 1642 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1468 "YandexPublishing.c"
+#line 1646 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1472 "YandexPublishing.c"
+#line 1650 "YandexPublishing.c"
 }
 
 
-GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_yandex_param_spec_publish_options (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags)
+{
 	PublishingYandexParamSpecPublishOptions* spec;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
@@ -1482,20 +1666,25 @@ GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1486 "YandexPublishing.c"
+#line 1670 "YandexPublishing.c"
 }
 
 
-gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
+gpointer
+publishing_yandex_value_get_publish_options (const GValue* value)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1495 "YandexPublishing.c"
+#line 1681 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object) {
+void
+publishing_yandex_value_set_publish_options (GValue* value,
+                                             gpointer v_object)
+{
 	PublishingYandexPublishOptions * old;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
@@ -1511,22 +1700,25 @@ void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1515 "YandexPublishing.c"
+#line 1704 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1519 "YandexPublishing.c"
+#line 1708 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1525 "YandexPublishing.c"
+#line 1714 "YandexPublishing.c"
 	}
 }
 
 
-void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object) {
+void
+publishing_yandex_value_take_publish_options (GValue* value,
+                                              gpointer v_object)
+{
 	PublishingYandexPublishOptions * old;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
@@ -1540,31 +1732,35 @@ void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1544 "YandexPublishing.c"
+#line 1736 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1548 "YandexPublishing.c"
+#line 1740 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1554 "YandexPublishing.c"
+#line 1746 "YandexPublishing.c"
 	}
 }
 
 
-static void publishing_yandex_publish_options_class_init (PublishingYandexPublishOptionsClass * klass) {
+static void
+publishing_yandex_publish_options_class_init (PublishingYandexPublishOptionsClass * klass)
+{
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize;
-#line 1564 "YandexPublishing.c"
+#line 1758 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publish_options_instance_init (PublishingYandexPublishOptions * self) {
+static void
+publishing_yandex_publish_options_instance_init (PublishingYandexPublishOptions * self)
+{
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->disable_comments = FALSE;
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1575,11 +1771,13 @@ static void publishing_yandex_publish_options_instance_init (PublishingYandexPub
 	self->destination_album_url = NULL;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->ref_count = 1;
-#line 1579 "YandexPublishing.c"
+#line 1775 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj) {
+static void
+publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj)
+{
 	PublishingYandexPublishOptions * self;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions);
@@ -1591,11 +1789,13 @@ static void publishing_yandex_publish_options_finalize (PublishingYandexPublishO
 	_g_free0 (self->destination_album);
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->destination_album_url);
-#line 1595 "YandexPublishing.c"
+#line 1793 "YandexPublishing.c"
 }
 
 
-GType publishing_yandex_publish_options_get_type (void) {
+GType
+publishing_yandex_publish_options_get_type (void)
+{
 	static volatile gsize publishing_yandex_publish_options_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_publish_options_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_yandex_value_publish_options_init, publishing_yandex_value_publish_options_free_value, publishing_yandex_value_publish_options_copy_value, publishing_yandex_value_publish_options_peek_pointer, "p", publishing_yandex_value_publish_options_collect_value, "p", publishing_yandex_value_publish_options_lcopy_value };
@@ -1609,18 +1809,22 @@ GType publishing_yandex_publish_options_get_type (void) {
 }
 
 
-gpointer publishing_yandex_publish_options_ref (gpointer instance) {
+gpointer
+publishing_yandex_publish_options_ref (gpointer instance)
+{
 	PublishingYandexPublishOptions * self;
 	self = instance;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return instance;
-#line 1620 "YandexPublishing.c"
+#line 1822 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_publish_options_unref (gpointer instance) {
+void
+publishing_yandex_publish_options_unref (gpointer instance)
+{
 	PublishingYandexPublishOptions * self;
 	self = instance;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1629,12 +1833,14 @@ void publishing_yandex_publish_options_unref (gpointer instance) {
 		PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1633 "YandexPublishing.c"
+#line 1837 "YandexPublishing.c"
 	}
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingYandexPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1643,27 +1849,33 @@ static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_opti
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1647 "YandexPublishing.c"
+#line 1853 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingYandexPublishingOptionsPane * self;
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1655 "YandexPublishing.c"
+#line 1863 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingYandexPublishingOptionsPane * self;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1663 "YandexPublishing.c"
+#line 1873 "YandexPublishing.c"
 }
 
 
-static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingYandexPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -1678,28 +1890,38 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi
 	result = _tmp1_;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1682 "YandexPublishing.c"
+#line 1894 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                  gpointer self)
+{
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1689 "YandexPublishing.c"
+#line 1904 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                 gpointer self)
+{
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1696 "YandexPublishing.c"
+#line 1914 "YandexPublishing.c"
 }
 
 
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type, PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
+PublishingYandexPublishingOptionsPane*
+publishing_yandex_publishing_options_pane_construct (GType object_type,
+                                                     PublishingYandexPublishOptions* options,
+                                                     GeeHashMap* list,
+                                                     SpitPublishingPluginHost* host)
+{
 	PublishingYandexPublishingOptionsPane * self = NULL;
-	PublishingYandexPublishOptions* _tmp0_;
-	GtkBox* _tmp1_;
+	GtkBox* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
@@ -1710,219 +1932,211 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexPublishingOptionsPane*) g_object_new (object_type, NULL);
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = options;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->options = _tmp0_;
+	self->priv->options = options;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->box);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->box = _tmp1_;
-#line 1725 "YandexPublishing.c"
+	self->priv->box = _tmp0_;
+#line 1945 "YandexPublishing.c"
 	{
+		GtkBuilder* _tmp1_;
 		GtkBuilder* _tmp2_;
 		GtkBuilder* _tmp3_;
-		GtkBuilder* _tmp4_;
 		GtkWidget* content = NULL;
-		GtkBuilder* _tmp5_;
-		GObject* _tmp6_;
-		GtkWidget* _tmp7_;
-		GtkBuilder* _tmp8_;
-		GObject* _tmp9_;
-		GtkComboBoxText* _tmp10_;
-		GtkComboBoxText* _tmp23_;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GtkWidget* _tmp6_;
+		GtkBuilder* _tmp7_;
+		GObject* _tmp8_;
+		GtkComboBoxText* _tmp9_;
+		GtkComboBoxText* _tmp20_;
+		GtkBuilder* _tmp21_;
+		GObject* _tmp22_;
+		GtkButton* _tmp23_;
 		GtkBuilder* _tmp24_;
 		GObject* _tmp25_;
 		GtkButton* _tmp26_;
-		GtkBuilder* _tmp27_;
-		GObject* _tmp28_;
-		GtkButton* _tmp29_;
-		GtkButton* _tmp30_;
-		GtkButton* _tmp31_;
+		GtkButton* _tmp27_;
+		GtkButton* _tmp28_;
+		GtkWidget* _tmp29_;
+		GtkContainer* _tmp30_;
+		GtkContainer* _tmp31_;
 		GtkWidget* _tmp32_;
-		GtkContainer* _tmp33_;
-		GtkContainer* _tmp34_;
-		GtkWidget* _tmp35_;
-		GtkBox* _tmp36_;
-		GtkWidget* _tmp37_;
+		GtkBox* _tmp33_;
+		GtkWidget* _tmp34_;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp2_ = gtk_builder_new ();
+		_tmp1_ = gtk_builder_new ();
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->builder);
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		self->priv->builder = _tmp2_;
+		self->priv->builder = _tmp1_;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp3_ = self->priv->builder;
+		_tmp2_ = self->priv->builder;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
+		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1764 "YandexPublishing.c"
-			goto __catch40_g_error;
+#line 1984 "YandexPublishing.c"
+			goto __catch33_g_error;
 		}
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp4_ = self->priv->builder;
+		_tmp3_ = self->priv->builder;
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		gtk_builder_connect_signals (_tmp4_, NULL);
+		gtk_builder_connect_signals (_tmp3_, NULL);
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = self->priv->builder;
+		_tmp4_ = self->priv->builder;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = gtk_builder_get_object (_tmp5_, "content");
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "content");
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp6_) : NULL);
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		content = _tmp7_;
+		content = _tmp6_;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp8_ = self->priv->builder;
+		_tmp7_ = self->priv->builder;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp9_ = gtk_builder_get_object (_tmp8_, "album_list");
+		_tmp8_ = gtk_builder_get_object (_tmp7_, "album_list");
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp9_) : NULL);
+		_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp8_) : NULL);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->album_list);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		self->priv->album_list = _tmp10_;
-#line 1789 "YandexPublishing.c"
+		self->priv->album_list = _tmp9_;
+#line 2009 "YandexPublishing.c"
 		{
 			GeeIterator* _key_it = NULL;
-			GeeHashMap* _tmp11_;
+			GeeSet* _tmp10_;
+			GeeSet* _tmp11_;
 			GeeSet* _tmp12_;
-			GeeSet* _tmp13_;
-			GeeSet* _tmp14_;
-			GeeIterator* _tmp15_;
-			GeeIterator* _tmp16_;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp11_ = list;
+			GeeIterator* _tmp13_;
+			GeeIterator* _tmp14_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp12_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+			_tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp13_ = _tmp12_;
+			_tmp11_ = _tmp10_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp14_ = _tmp13_;
+			_tmp12_ = _tmp11_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp16_ = _tmp15_;
+			_tmp14_ = _tmp13_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_g_object_unref0 (_tmp14_);
+			_g_object_unref0 (_tmp12_);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_key_it = _tmp16_;
+			_key_it = _tmp14_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 1816 "YandexPublishing.c"
-				GeeIterator* _tmp17_;
-				gboolean _tmp18_;
+#line 2033 "YandexPublishing.c"
+				GeeIterator* _tmp15_;
 				gchar* key = NULL;
-				GeeIterator* _tmp19_;
-				gpointer _tmp20_;
-				GtkComboBoxText* _tmp21_;
-				const gchar* _tmp22_;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp17_ = _key_it;
+				GeeIterator* _tmp16_;
+				gpointer _tmp17_;
+				GtkComboBoxText* _tmp18_;
+				const gchar* _tmp19_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp18_ = gee_iterator_next (_tmp17_);
+				_tmp15_ = _key_it;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (!_tmp18_) {
+				if (!gee_iterator_next (_tmp15_)) {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1832 "YandexPublishing.c"
+#line 2046 "YandexPublishing.c"
 				}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp19_ = _key_it;
+				_tmp16_ = _key_it;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp20_ = gee_iterator_get (_tmp19_);
+				_tmp17_ = gee_iterator_get (_tmp16_);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				key = (gchar*) _tmp20_;
+				key = (gchar*) _tmp17_;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp21_ = self->priv->album_list;
+				_tmp18_ = self->priv->album_list;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp22_ = key;
+				_tmp19_ = key;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
+				gtk_combo_box_text_append_text (_tmp18_, _tmp19_);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (key);
-#line 1848 "YandexPublishing.c"
+#line 2062 "YandexPublishing.c"
 			}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (_key_it);
-#line 1852 "YandexPublishing.c"
+#line 2066 "YandexPublishing.c"
 		}
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp23_ = self->priv->album_list;
+		_tmp20_ = self->priv->album_list;
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp24_ = self->priv->builder;
+		_tmp21_ = self->priv->builder;
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp25_ = gtk_builder_get_object (_tmp24_, "publish_button");
+		_tmp22_ = gtk_builder_get_object (_tmp21_, "publish_button");
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
+		_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_button_get_type ()) ? ((GtkButton*) _tmp22_) : NULL);
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->publish_button);
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		self->priv->publish_button = _tmp26_;
+		self->priv->publish_button = _tmp23_;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp27_ = self->priv->builder;
+		_tmp24_ = self->priv->builder;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp28_ = gtk_builder_get_object (_tmp27_, "logout_button");
+		_tmp25_ = gtk_builder_get_object (_tmp24_, "logout_button");
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL);
+		_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->logout_button);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		self->priv->logout_button = _tmp29_;
+		self->priv->logout_button = _tmp26_;
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp30_ = self->priv->publish_button;
+		_tmp27_ = self->priv->publish_button;
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_signal_connect_object (_tmp30_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp27_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp31_ = self->priv->logout_button;
+		_tmp28_ = self->priv->logout_button;
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_signal_connect_object (_tmp31_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp32_ = content;
+		_tmp29_ = content;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp33_ = gtk_widget_get_parent (_tmp32_);
+		_tmp30_ = gtk_widget_get_parent (_tmp29_);
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp34_ = _tmp33_;
+		_tmp31_ = _tmp30_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp35_ = content;
+		_tmp32_ = content;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		gtk_container_remove (_tmp34_, _tmp35_);
+		gtk_container_remove (_tmp31_, _tmp32_);
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp36_ = self->priv->box;
+		_tmp33_ = self->priv->box;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp37_ = content;
+		_tmp34_ = content;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0);
+		gtk_box_pack_start (_tmp33_, _tmp34_, TRUE, TRUE, (guint) 0);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (content);
-#line 1904 "YandexPublishing.c"
+#line 2118 "YandexPublishing.c"
 	}
-	goto __finally40;
-	__catch40_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp38_;
-		const gchar* _tmp39_;
+		GError* _tmp35_;
+		const gchar* _tmp36_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp38_ = e;
+		_tmp35_ = e;
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp39_ = _tmp38_->message;
+		_tmp36_ = _tmp35_->message;
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_);
+		g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp36_);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1924 "YandexPublishing.c"
+#line 2138 "YandexPublishing.c"
 	}
-	__finally40:
+	__finally33:
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1931,31 +2145,39 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		g_clear_error (&_inner_error_);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 1935 "YandexPublishing.c"
+#line 2149 "YandexPublishing.c"
 	}
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1939 "YandexPublishing.c"
+#line 2153 "YandexPublishing.c"
 }
 
 
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
+PublishingYandexPublishingOptionsPane*
+publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options,
+                                               GeeHashMap* list,
+                                               SpitPublishingPluginHost* host)
+{
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host);
-#line 1946 "YandexPublishing.c"
+#line 2164 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self) {
+static void
+publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self)
+{
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 1955 "YandexPublishing.c"
+#line 2175 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self) {
+static void
+publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self)
+{
 	PublishingYandexPublishOptions* _tmp0_;
 	GtkComboBoxText* _tmp1_;
 	gchar* _tmp2_;
@@ -2052,11 +2274,13 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
 	_g_object_unref0 (access_type);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (tmp);
-#line 2056 "YandexPublishing.c"
+#line 2278 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_class_init (PublishingYandexPublishingOptionsPaneClass * klass) {
+static void
+publishing_yandex_publishing_options_pane_class_init (PublishingYandexPublishingOptionsPaneClass * klass)
+{
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2067,11 +2291,13 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand
 	publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2071 "YandexPublishing.c"
+#line 2295 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2082,18 +2308,22 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan
 	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_widget;
-#line 2086 "YandexPublishing.c"
+#line 2312 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) {
+static void
+publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self)
+{
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 2093 "YandexPublishing.c"
+#line 2321 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_yandex_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingYandexPublishingOptionsPane * self;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
@@ -2109,11 +2339,13 @@ static void publishing_yandex_publishing_options_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->album_list);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj);
-#line 2113 "YandexPublishing.c"
+#line 2343 "YandexPublishing.c"
 }
 
 
-GType publishing_yandex_publishing_options_pane_get_type (void) {
+GType
+publishing_yandex_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_yandex_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_yandex_publishing_options_pane_instance_init, NULL };
@@ -2127,42 +2359,44 @@ GType publishing_yandex_publishing_options_pane_get_type (void) {
 }
 
 
-PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
+PublishingYandexUploader*
+publishing_yandex_uploader_construct (GType object_type,
+                                      PublishingYandexSession* session,
+                                      PublishingYandexPublishOptions* options,
+                                      SpitPublishingPublishable** photos,
+                                      int photos_length1)
+{
 	PublishingYandexUploader* self = NULL;
-	PublishingYandexSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingYandexPublishOptions* _tmp2_;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = session;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = photos;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1__length1 = photos_length1;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = (PublishingYandexUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = options;
+	self = (PublishingYandexUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), photos, photos_length1);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->options = _tmp2_;
+	self->priv->options = options;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2155 "YandexPublishing.c"
+#line 2381 "YandexPublishing.c"
 }
 
 
-PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
+PublishingYandexUploader*
+publishing_yandex_uploader_new (PublishingYandexSession* session,
+                                PublishingYandexPublishOptions* options,
+                                SpitPublishingPublishable** photos,
+                                int photos_length1)
+{
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1);
-#line 2162 "YandexPublishing.c"
+#line 2393 "YandexPublishing.c"
 }
 
 
-static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                    SpitPublishingPublishable* publishable)
+{
 	PublishingYandexUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	PublishingRESTSupportSession* _tmp0_;
@@ -2200,11 +2434,13 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
 	result = _tmp6_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2204 "YandexPublishing.c"
+#line 2438 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass * klass) {
+static void
+publishing_yandex_uploader_class_init (PublishingYandexUploaderClass * klass)
+{
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_uploader_parent_class = g_type_class_peek_parent (klass);
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2213,28 +2449,34 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass
 	g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate));
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction;
-#line 2217 "YandexPublishing.c"
+#line 2453 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) {
+static void
+publishing_yandex_uploader_instance_init (PublishingYandexUploader * self)
+{
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self);
-#line 2224 "YandexPublishing.c"
+#line 2462 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
 	PublishingYandexUploader * self;
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj);
-#line 2234 "YandexPublishing.c"
+#line 2474 "YandexPublishing.c"
 }
 
 
-GType publishing_yandex_uploader_get_type (void) {
+GType
+publishing_yandex_uploader_get_type (void)
+{
 	static volatile gsize publishing_yandex_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_uploader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexUploader), 0, (GInstanceInitFunc) publishing_yandex_uploader_instance_init, NULL };
@@ -2246,40 +2488,47 @@ GType publishing_yandex_uploader_get_type (void) {
 }
 
 
-static gchar* bool_to_string (gboolean self) {
+static gchar*
+bool_to_string (gboolean self)
+{
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (self) {
-#line 2254 "YandexPublishing.c"
+#line 2498 "YandexPublishing.c"
 		gchar* _tmp0_;
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 2262 "YandexPublishing.c"
+#line 2506 "YandexPublishing.c"
 	} else {
 		gchar* _tmp1_;
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 2271 "YandexPublishing.c"
+#line 2515 "YandexPublishing.c"
 	}
 }
 
 
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 2279 "YandexPublishing.c"
+#line 2525 "YandexPublishing.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;
@@ -2291,126 +2540,123 @@ 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 2323 "YandexPublishing.c"
+#line 2572 "YandexPublishing.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 2329 "YandexPublishing.c"
+#line 2578 "YandexPublishing.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	var = (g_free (var), NULL);
-#line 2336 "YandexPublishing.c"
+#line 2587 "YandexPublishing.c"
 }
 
 
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 2343 "YandexPublishing.c"
+#line 2596 "YandexPublishing.c"
 }
 
 
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
+PublishingYandexUploadTransaction*
+publishing_yandex_upload_transaction_construct (GType object_type,
+                                                PublishingYandexSession* session,
+                                                PublishingYandexPublishOptions* options,
+                                                SpitPublishingPublishable* photo)
+{
 	PublishingYandexUploadTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_;
-	PublishingYandexPublishOptions* _tmp1_;
-	const gchar* _tmp2_;
-	SpitPublishingPublishable* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingYandexPublishOptions* _tmp6_;
-	const gchar* _tmp7_;
-	PublishingYandexPublishOptions* _tmp8_;
-	const gchar* _tmp9_;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
 	SoupMultipart* message_parts = NULL;
-	SoupMultipart* _tmp10_;
-	SpitPublishingPublishable* _tmp11_;
+	SoupMultipart* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gboolean _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gboolean _tmp11_;
 	gchar* _tmp12_;
 	gchar* _tmp13_;
-	PublishingYandexPublishOptions* _tmp14_;
-	gboolean _tmp15_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
 	gchar* _tmp16_;
-	gchar* _tmp17_;
-	PublishingYandexPublishOptions* _tmp18_;
-	gboolean _tmp19_;
-	gchar* _tmp20_;
-	gchar* _tmp21_;
-	PublishingYandexPublishOptions* _tmp22_;
-	const gchar* _tmp23_;
-	gchar* _tmp24_;
-	gchar* _tmp25_;
 	gchar* photo_data = NULL;
 	gsize data_length = 0UL;
 	gint image_part_num = 0;
-	gint _tmp40_;
 	SoupBuffer* bindable_data = NULL;
-	guint8* _tmp41_;
-	gint _tmp41__length1;
-	guint8* _tmp42_;
-	gint _tmp42__length1;
-	SoupBuffer* _tmp43_;
-	SpitPublishingPublishable* _tmp44_;
-	GFile* _tmp45_;
-	GFile* _tmp46_;
-	gchar* _tmp47_;
-	gchar* _tmp48_;
+	guint8* _tmp29_;
+	gint _tmp29__length1;
+	guint8* _tmp30_;
+	gint _tmp30__length1;
+	SoupBuffer* _tmp31_;
+	GFile* _tmp32_;
+	GFile* _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
 	SoupMessageHeaders* image_part_header = NULL;
 	SoupBuffer* image_part_body = NULL;
-	SoupMessageHeaders* _tmp49_ = NULL;
-	SoupBuffer* _tmp50_ = NULL;
+	SoupMessageHeaders* _tmp36_ = NULL;
+	SoupBuffer* _tmp37_ = NULL;
 	GHashTable* _result_ = NULL;
-	GHashFunc _tmp51_;
-	GEqualFunc _tmp52_;
-	GHashTable* _tmp53_;
-	gchar* _tmp54_;
-	gchar* _tmp55_;
-	gchar* _tmp56_;
-	gchar* _tmp57_;
+	GHashFunc _tmp38_;
+	GEqualFunc _tmp39_;
+	GHashTable* _tmp40_;
+	gchar* _tmp41_;
+	gchar* _tmp42_;
+	gchar* _tmp43_;
+	gchar* _tmp44_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp58_;
-	gchar* _tmp59_;
-	SoupMessage* _tmp60_;
-	SoupMessage* _tmp61_;
-	SoupMessageHeaders* _tmp62_;
-	PublishingYandexSession* _tmp63_;
-	gchar* _tmp64_;
-	gchar* _tmp65_;
-	gchar* _tmp66_;
-	gchar* _tmp67_;
-	SoupMessageHeaders* _tmp68_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	SoupMessage* _tmp47_;
+	SoupMessage* _tmp48_;
+	SoupMessageHeaders* _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
+	SoupMessageHeaders* _tmp54_;
 	GError * _inner_error_ = NULL;
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
@@ -2419,120 +2665,99 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (photo), NULL);
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = session;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = options;
+	_tmp0_ = options->destination_album_url;
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = _tmp1_->destination_album_url;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = (PublishingYandexUploadTransaction*) publishing_yandex_transaction_construct_with_url (object_type, _tmp0_, _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingYandexUploadTransaction*) publishing_yandex_transaction_construct_with_url (object_type, session, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "qwe", "image/jpeg", (gulong) 1);
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = photo;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = spit_publishing_publishable_get_publishing_name (_tmp3_);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp1_ = spit_publishing_publishable_get_publishing_name (photo);
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp6_ = options;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp7_ = _tmp6_->destination_album;
+	_tmp2_ = _tmp1_;
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp8_ = options;
+	_tmp3_ = options->destination_album;
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp9_ = _tmp8_->destination_album_url;
+	_tmp4_ = options->destination_album_url;
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:259: Uploading '%s' -> %s : %s", _tmp5_, _tmp7_, _tmp9_);
+	g_debug ("YandexPublishing.vala:259: Uploading '%s' -> %s : %s", _tmp2_, _tmp3_, _tmp4_);
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp2_);
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp10_ = soup_multipart_new ("multipart/form-data");
+	_tmp5_ = soup_multipart_new ("multipart/form-data");
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	message_parts = _tmp10_;
+	message_parts = _tmp5_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp11_ = photo;
+	_tmp6_ = spit_publishing_publishable_get_publishing_name (photo);
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp12_ = spit_publishing_publishable_get_publishing_name (_tmp11_);
+	_tmp7_ = _tmp6_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp13_ = _tmp12_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_append_form_string (message_parts, "title", _tmp13_);
+	soup_multipart_append_form_string (message_parts, "title", _tmp7_);
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp13_);
+	_g_free0 (_tmp7_);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp14_ = options;
+	_tmp8_ = options->hide_original;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp15_ = _tmp14_->hide_original;
+	_tmp9_ = bool_to_string (_tmp8_);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp16_ = bool_to_string (_tmp15_);
+	_tmp10_ = _tmp9_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp17_ = _tmp16_;
+	soup_multipart_append_form_string (message_parts, "hide_original", _tmp10_);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_append_form_string (message_parts, "hide_original", _tmp17_);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp17_);
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp18_ = options;
+	_g_free0 (_tmp10_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp19_ = _tmp18_->disable_comments;
+	_tmp11_ = options->disable_comments;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp20_ = bool_to_string (_tmp19_);
+	_tmp12_ = bool_to_string (_tmp11_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp21_ = _tmp20_;
+	_tmp13_ = _tmp12_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_append_form_string (message_parts, "disable_comments", _tmp21_);
+	soup_multipart_append_form_string (message_parts, "disable_comments", _tmp13_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp21_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp22_ = options;
+	_g_free0 (_tmp13_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp23_ = _tmp22_->access_type;
+	_tmp14_ = options->access_type;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp24_ = g_utf8_strdown (_tmp23_, (gssize) -1);
+	_tmp15_ = g_utf8_strdown (_tmp14_, (gssize) -1);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp25_ = _tmp24_;
+	_tmp16_ = _tmp15_;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_append_form_string (message_parts, "access", _tmp25_);
+	soup_multipart_append_form_string (message_parts, "access", _tmp16_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp25_);
-#line 2500 "YandexPublishing.c"
+	_g_free0 (_tmp16_);
+#line 2728 "YandexPublishing.c"
 	{
-		SpitPublishingPublishable* _tmp26_;
-		GFile* _tmp27_;
-		GFile* _tmp28_;
-		gchar* _tmp29_;
-		gchar* _tmp30_;
-		gchar* _tmp31_ = NULL;
-		gsize _tmp32_ = 0UL;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_ = NULL;
+		gsize _tmp22_ = 0UL;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp26_ = photo;
+		_tmp17_ = spit_publishing_publishable_get_serialized_file (photo);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp27_ = spit_publishing_publishable_get_serialized_file (_tmp26_);
+		_tmp18_ = _tmp17_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp28_ = _tmp27_;
+		_tmp19_ = g_file_get_path (_tmp18_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp29_ = g_file_get_path (_tmp28_);
+		_tmp20_ = _tmp19_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp30_ = _tmp29_;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_file_get_contents (_tmp30_, &_tmp31_, &_tmp32_, &_inner_error_);
+		g_file_get_contents (_tmp20_, &_tmp21_, &_tmp22_, &_inner_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (photo_data);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		photo_data = _tmp31_;
+		photo_data = _tmp21_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		data_length = _tmp32_;
+		data_length = _tmp22_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp30_);
+		_g_free0 (_tmp20_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_object_unref0 (_tmp28_);
+		_g_object_unref0 (_tmp18_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 2535 "YandexPublishing.c"
-				goto __catch41_g_file_error;
+#line 2760 "YandexPublishing.c"
+				goto __catch34_g_file_error;
 			}
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_free0 (photo_data);
@@ -2544,49 +2769,46 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 			g_clear_error (&_inner_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return NULL;
-#line 2548 "YandexPublishing.c"
+#line 2773 "YandexPublishing.c"
 		}
 	}
-	goto __finally41;
-	__catch41_g_file_error:
+	goto __finally34;
+	__catch34_g_file_error:
 	{
 		GError* e = NULL;
-		SpitPublishingPublishable* _tmp33_;
-		GFile* _tmp34_;
-		GFile* _tmp35_;
-		gchar* _tmp36_;
-		gchar* _tmp37_;
-		GError* _tmp38_;
-		const gchar* _tmp39_;
+		GFile* _tmp23_;
+		GFile* _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
+		GError* _tmp27_;
+		const gchar* _tmp28_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp33_ = photo;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp34_ = spit_publishing_publishable_get_serialized_file (_tmp33_);
+		_tmp23_ = spit_publishing_publishable_get_serialized_file (photo);
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp35_ = _tmp34_;
+		_tmp24_ = _tmp23_;
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp36_ = g_file_get_path (_tmp35_);
+		_tmp25_ = g_file_get_path (_tmp24_);
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp37_ = _tmp36_;
+		_tmp26_ = _tmp25_;
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp38_ = e;
+		_tmp27_ = e;
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp39_ = _tmp38_->message;
+		_tmp28_ = _tmp27_->message;
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_critical ("YandexPublishing.vala:273: Failed to read data file '%s': %s", _tmp37_, _tmp39_);
+		g_critical ("YandexPublishing.vala:273: Failed to read data file '%s': %s", _tmp26_, _tmp28_);
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp37_);
+		_g_free0 (_tmp26_);
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_object_unref0 (_tmp35_);
+		_g_object_unref0 (_tmp24_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 2588 "YandexPublishing.c"
+#line 2810 "YandexPublishing.c"
 	}
-	__finally41:
+	__finally34:
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2599,100 +2821,94 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 2603 "YandexPublishing.c"
+#line 2825 "YandexPublishing.c"
 	}
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp40_ = soup_multipart_get_length (message_parts);
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	image_part_num = _tmp40_;
+	image_part_num = soup_multipart_get_length (message_parts);
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp41_ = string_get_data (photo_data, &_tmp41__length1);
+	_tmp29_ = string_get_data (photo_data, &_tmp29__length1);
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp42_ = _tmp41_;
+	_tmp30_ = _tmp29_;
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp42__length1 = _tmp41__length1;
+	_tmp30__length1 = _tmp29__length1;
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0);
+	_tmp31_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp30_ + 0, ((gint) data_length) - 0);
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	bindable_data = _tmp43_;
+	bindable_data = _tmp31_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp44_ = photo;
+	_tmp32_ = spit_publishing_publishable_get_serialized_file (photo);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_);
+	_tmp33_ = _tmp32_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp46_ = _tmp45_;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp47_ = g_file_get_path (_tmp46_);
+	_tmp34_ = g_file_get_path (_tmp33_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp48_ = _tmp47_;
+	_tmp35_ = _tmp34_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data);
+	soup_multipart_append_form_file (message_parts, "", _tmp35_, "image/jpeg", bindable_data);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp48_);
+	_g_free0 (_tmp35_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (_tmp46_);
+	_g_object_unref0 (_tmp33_);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_);
+	soup_multipart_get_part (message_parts, image_part_num, &_tmp36_, &_tmp37_);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	image_part_header = _tmp49_;
+	image_part_header = _tmp36_;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	image_part_body = _tmp50_;
+	image_part_body = _tmp37_;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp51_ = g_str_hash;
+	_tmp38_ = g_str_hash;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp52_ = g_str_equal;
+	_tmp39_ = g_str_equal;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
+	_tmp40_ = g_hash_table_new_full (_tmp38_, _tmp39_, _g_free0_, _g_free0_);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_result_ = _tmp53_;
+	_result_ = _tmp40_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp54_ = g_strdup ("name");
+	_tmp41_ = g_strdup ("name");
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp55_ = g_strdup ("image");
+	_tmp42_ = g_strdup ("image");
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_hash_table_insert (_result_, _tmp54_, _tmp55_);
+	g_hash_table_insert (_result_, _tmp41_, _tmp42_);
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp56_ = g_strdup ("filename");
+	_tmp43_ = g_strdup ("filename");
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp57_ = g_strdup ("unused");
+	_tmp44_ = g_strdup ("unused");
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_hash_table_insert (_result_, _tmp56_, _tmp57_);
+	g_hash_table_insert (_result_, _tmp43_, _tmp44_);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_message_headers_set_content_disposition (image_part_header, "form-data", _result_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp45_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp59_ = _tmp58_;
+	_tmp46_ = _tmp45_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts);
+	_tmp47_ = soup_form_request_new_from_multipart (_tmp46_, message_parts);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp61_ = _tmp60_;
+	_tmp48_ = _tmp47_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp59_);
+	_g_free0 (_tmp46_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	outbound_message = _tmp61_;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp62_ = outbound_message->request_headers;
+	outbound_message = _tmp48_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp63_ = session;
+	_tmp49_ = outbound_message->request_headers;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_);
+	_tmp50_ = publishing_yandex_session_get_auth_token (session);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp65_ = _tmp64_;
+	_tmp51_ = _tmp50_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_);
+	_tmp52_ = g_strdup_printf ("OAuth %s", _tmp51_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp67_ = _tmp66_;
+	_tmp53_ = _tmp52_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_message_headers_append (_tmp62_, "Authorization", _tmp67_);
+	soup_message_headers_append (_tmp49_, "Authorization", _tmp53_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp67_);
+	_g_free0 (_tmp53_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp65_);
+	_g_free0 (_tmp51_);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp68_ = outbound_message->request_headers;
+	_tmp54_ = outbound_message->request_headers;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_message_headers_append (_tmp68_, "Connection", "close");
+	soup_message_headers_append (_tmp54_, "Connection", "close");
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2707,29 +2923,39 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	__vala_SoupMultipart_free0 (message_parts);
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2711 "YandexPublishing.c"
+#line 2927 "YandexPublishing.c"
 }
 
 
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
+PublishingYandexUploadTransaction*
+publishing_yandex_upload_transaction_new (PublishingYandexSession* session,
+                                          PublishingYandexPublishOptions* options,
+                                          SpitPublishingPublishable* photo)
+{
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo);
-#line 2718 "YandexPublishing.c"
+#line 2938 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) {
+static void
+publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass)
+{
 #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2725 "YandexPublishing.c"
+#line 2947 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_upload_transaction_instance_init (PublishingYandexUploadTransaction * self) {
+static void
+publishing_yandex_upload_transaction_instance_init (PublishingYandexUploadTransaction * self)
+{
 }
 
 
-GType publishing_yandex_upload_transaction_get_type (void) {
+GType
+publishing_yandex_upload_transaction_get_type (void)
+{
 	static volatile gsize publishing_yandex_upload_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_upload_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexUploadTransaction), 0, (GInstanceInitFunc) publishing_yandex_upload_transaction_instance_init, NULL };
@@ -2741,13 +2967,15 @@ GType publishing_yandex_upload_transaction_get_type (void) {
 }
 
 
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYandexYandexPublisher*
+publishing_yandex_yandex_publisher_construct (GType object_type,
+                                              SpitPublishingService* service,
+                                              SpitPublishingPluginHost* host)
+{
 	PublishingYandexYandexPublisher * self = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingYandexSession* _tmp2_;
-	GeeHashMap* _tmp3_;
-	PublishingYandexPublishOptions* _tmp4_;
+	PublishingYandexSession* _tmp0_;
+	GeeHashMap* _tmp1_;
+	PublishingYandexPublishOptions* _tmp2_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2755,45 +2983,46 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexYandexPublisher*) g_object_new (object_type, NULL);
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = service;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->service = _tmp0_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = host;
+	self->priv->service = service;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->host = _tmp1_;
+	self->priv->host = host;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = publishing_yandex_session_new ();
+	_tmp0_ = publishing_yandex_session_new ();
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->session = _tmp2_;
+	self->priv->session = _tmp0_;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = 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);
+	_tmp1_ = 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 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->album_list);
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->album_list = _tmp3_;
+	self->priv->album_list = _tmp1_;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = publishing_yandex_publish_options_new ();
+	_tmp2_ = publishing_yandex_publish_options_new ();
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_yandex_publish_options_unref0 (self->priv->options);
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->options = _tmp4_;
+	self->priv->options = _tmp2_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2786 "YandexPublishing.c"
+#line 3010 "YandexPublishing.c"
 }
 
 
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYandexYandexPublisher*
+publishing_yandex_yandex_publisher_new (SpitPublishingService* service,
+                                        SpitPublishingPluginHost* host)
+{
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host);
-#line 2793 "YandexPublishing.c"
+#line 3020 "YandexPublishing.c"
 }
 
 
-gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self) {
+gchar*
+publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -2807,13 +3036,15 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY
 	result = _tmp1_;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2811 "YandexPublishing.c"
+#line 3040 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
+void
+publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self,
+                                                              const gchar* auth_token)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2821,14 +3052,14 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = auth_token;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_);
-#line 2828 "YandexPublishing.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", auth_token);
+#line 3057 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self) {
+void
+publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -2836,11 +3067,13 @@ void publishing_yandex_yandex_publisher_invalidate_persistent_session (Publishin
 	_tmp0_ = self->priv->host;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token");
-#line 2840 "YandexPublishing.c"
+#line 3071 "YandexPublishing.c"
 }
 
 
-gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self) {
+gboolean
+publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self)
+{
 	gboolean result = FALSE;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -2859,11 +3092,13 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub
 	result = _tmp2_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2863 "YandexPublishing.c"
+#line 3096 "YandexPublishing.c"
 }
 
 
-static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base)
+{
 	PublishingYandexYandexPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -2875,11 +3110,13 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2879 "YandexPublishing.c"
+#line 3114 "YandexPublishing.c"
 }
 
 
-static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base)
+{
 	PublishingYandexYandexPublisher * self;
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
@@ -2894,11 +3131,14 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic
 	result = _tmp1_;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2898 "YandexPublishing.c"
+#line 3135 "YandexPublishing.c"
 }
 
 
-static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self, PublishingRESTSupportXmlDocument* doc) {
+static gchar*
+publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self,
+                                                   PublishingRESTSupportXmlDocument* doc)
+{
 	gchar* result = NULL;
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
@@ -2908,11 +3148,15 @@ static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYande
 	result = NULL;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2912 "YandexPublishing.c"
+#line 3152 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self, xmlNode* e, GError** error) {
+static void
+publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self,
+                                                      xmlNode* e,
+                                                      GError** error)
+{
 	gchar* title = NULL;
 	gchar* link = NULL;
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2921,154 +3165,151 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 	title = NULL;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	link = NULL;
-#line 2925 "YandexPublishing.c"
+#line 3169 "YandexPublishing.c"
 	{
 		xmlNode* c = NULL;
 		xmlNode* _tmp0_;
-		xmlNode* _tmp1_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp0_ = e;
+		_tmp0_ = e->children;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp1_ = _tmp0_->children;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		c = _tmp1_;
-#line 2936 "YandexPublishing.c"
+		c = _tmp0_;
+#line 3177 "YandexPublishing.c"
 		{
-			gboolean _tmp2_ = FALSE;
+			gboolean _tmp1_ = FALSE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp2_ = TRUE;
+			_tmp1_ = TRUE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 2943 "YandexPublishing.c"
+#line 3184 "YandexPublishing.c"
+				xmlNode* _tmp4_;
 				xmlNode* _tmp5_;
-				xmlNode* _tmp6_;
-				const gchar* _tmp7_;
-				gboolean _tmp10_ = FALSE;
-				xmlNode* _tmp11_;
-				const gchar* _tmp12_;
-				gboolean _tmp18_ = FALSE;
-				const gchar* _tmp19_;
+				const gchar* _tmp6_;
+				gboolean _tmp9_ = FALSE;
+				xmlNode* _tmp10_;
+				const gchar* _tmp11_;
+				gboolean _tmp17_ = FALSE;
+				const gchar* _tmp18_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (!_tmp2_) {
-#line 2954 "YandexPublishing.c"
+				if (!_tmp1_) {
+#line 3195 "YandexPublishing.c"
+					xmlNode* _tmp2_;
 					xmlNode* _tmp3_;
-					xmlNode* _tmp4_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp3_ = c;
+					_tmp2_ = c;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp4_ = _tmp3_->next;
+					_tmp3_ = _tmp2_->next;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					c = _tmp4_;
-#line 2963 "YandexPublishing.c"
+					c = _tmp3_;
+#line 3204 "YandexPublishing.c"
 				}
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp2_ = FALSE;
+				_tmp1_ = FALSE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp5_ = c;
+				_tmp4_ = c;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (!(_tmp5_ != NULL)) {
+				if (!(_tmp4_ != NULL)) {
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 2973 "YandexPublishing.c"
+#line 3214 "YandexPublishing.c"
 				}
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp6_ = c;
+				_tmp5_ = c;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp7_ = _tmp6_->name;
+				_tmp6_ = _tmp5_->name;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 2981 "YandexPublishing.c"
-					xmlNode* _tmp8_;
-					gchar* _tmp9_;
+				if (g_strcmp0 (_tmp6_, "title") == 0) {
+#line 3222 "YandexPublishing.c"
+					xmlNode* _tmp7_;
+					gchar* _tmp8_;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp8_ = c;
+					_tmp7_ = c;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp9_ = (gchar*) xmlNodeGetContent (_tmp8_);
+					_tmp8_ = (gchar*) xmlNodeGetContent (_tmp7_);
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (title);
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					title = _tmp9_;
-#line 2992 "YandexPublishing.c"
+					title = _tmp8_;
+#line 3233 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp11_ = c;
+				_tmp10_ = c;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp12_ = _tmp11_->name;
+				_tmp11_ = _tmp10_->name;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 3000 "YandexPublishing.c"
-					xmlNode* _tmp13_;
+				if (g_strcmp0 (_tmp11_, "link") == 0) {
+#line 3241 "YandexPublishing.c"
+					xmlNode* _tmp12_;
+					gchar* _tmp13_;
 					gchar* _tmp14_;
-					gchar* _tmp15_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp13_ = c;
+					_tmp12_ = c;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "rel");
+					_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "rel");
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp15_ = _tmp14_;
+					_tmp14_ = _tmp13_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
+					_tmp9_ = g_strcmp0 (_tmp14_, "photos") == 0;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_g_free0 (_tmp15_);
-#line 3014 "YandexPublishing.c"
+					_g_free0 (_tmp14_);
+#line 3255 "YandexPublishing.c"
 				} else {
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp10_ = FALSE;
-#line 3018 "YandexPublishing.c"
+					_tmp9_ = FALSE;
+#line 3259 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (_tmp10_) {
-#line 3022 "YandexPublishing.c"
-					xmlNode* _tmp16_;
-					gchar* _tmp17_;
+				if (_tmp9_) {
+#line 3263 "YandexPublishing.c"
+					xmlNode* _tmp15_;
+					gchar* _tmp16_;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp16_ = c;
+					_tmp15_ = c;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp17_ = (gchar*) xmlGetProp (_tmp16_, (xmlChar*) "href");
+					_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "href");
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (link);
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					link = _tmp17_;
-#line 3033 "YandexPublishing.c"
+					link = _tmp16_;
+#line 3274 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp19_ = title;
+				_tmp18_ = title;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (_tmp19_ != NULL) {
-#line 3039 "YandexPublishing.c"
-					const gchar* _tmp20_;
+				if (_tmp18_ != NULL) {
+#line 3280 "YandexPublishing.c"
+					const gchar* _tmp19_;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp20_ = link;
+					_tmp19_ = link;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp18_ = _tmp20_ != NULL;
-#line 3045 "YandexPublishing.c"
+					_tmp17_ = _tmp19_ != NULL;
+#line 3286 "YandexPublishing.c"
 				} else {
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp18_ = FALSE;
-#line 3049 "YandexPublishing.c"
+					_tmp17_ = FALSE;
+#line 3290 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (_tmp18_) {
-#line 3053 "YandexPublishing.c"
+				if (_tmp17_) {
+#line 3294 "YandexPublishing.c"
+					const gchar* _tmp20_;
 					const gchar* _tmp21_;
-					const gchar* _tmp22_;
-					GeeHashMap* _tmp23_;
+					GeeHashMap* _tmp22_;
+					const gchar* _tmp23_;
 					const gchar* _tmp24_;
-					const gchar* _tmp25_;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp21_ = title;
+					_tmp20_ = title;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp22_ = link;
+					_tmp21_ = link;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_debug ("YandexPublishing.vala:362: Added album: '%s', link: %s", _tmp21_, _tmp22_);
+					g_debug ("YandexPublishing.vala:362: Added album: '%s', link: %s", _tmp20_, _tmp21_);
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp23_ = self->priv->album_list;
+					_tmp22_ = self->priv->album_list;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp24_ = title;
+					_tmp23_ = title;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp25_ = link;
+					_tmp24_ = link;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_);
+					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_, _tmp24_);
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (title);
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3079,7 +3320,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					link = NULL;
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3083 "YandexPublishing.c"
+#line 3324 "YandexPublishing.c"
 				}
 			}
 		}
@@ -3088,38 +3329,42 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 	_g_free0 (link);
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (title);
-#line 3092 "YandexPublishing.c"
+#line 3333 "YandexPublishing.c"
 }
 
 
-static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                                  gpointer self)
+{
 	gchar* result;
 	result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3101 "YandexPublishing.c"
+#line 3345 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
+void
+publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self,
+                                                         const gchar* data,
+                                                         GError** error)
+{
 	PublishingRESTSupportXmlDocument* doc = NULL;
-	const gchar* _tmp0_;
-	PublishingRESTSupportXmlDocument* _tmp1_;
+	PublishingRESTSupportXmlDocument* _tmp0_;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp2_;
+	PublishingRESTSupportXmlDocument* _tmp1_;
+	xmlNode* _tmp2_;
 	xmlNode* _tmp3_;
-	xmlNode* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (data != NULL);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = data;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
+	_tmp0_ = publishing_rest_support_xml_document_parse_string (data, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	doc = _tmp1_;
+	doc = _tmp0_;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3128,7 +3373,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_propagate_error (error, _inner_error_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3132 "YandexPublishing.c"
+#line 3377 "YandexPublishing.c"
 		} else {
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3136,19 +3381,19 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_clear_error (&_inner_error_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3140 "YandexPublishing.c"
+#line 3385 "YandexPublishing.c"
 		}
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = doc;
+	_tmp1_ = doc;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
+	_tmp2_ = publishing_rest_support_xml_document_get_root_node (_tmp1_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	root = _tmp3_;
+	root = _tmp2_;
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = root;
+	_tmp3_ = root;
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp4_, &_inner_error_);
+	publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp3_, &_inner_error_);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3159,7 +3404,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3163 "YandexPublishing.c"
+#line 3408 "YandexPublishing.c"
 		} else {
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -3169,33 +3414,34 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_clear_error (&_inner_error_);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3173 "YandexPublishing.c"
+#line 3418 "YandexPublishing.c"
 		}
 	}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3178 "YandexPublishing.c"
+#line 3423 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
+void
+publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self,
+                                                     const gchar* data,
+                                                     GError** error)
+{
 	PublishingRESTSupportXmlDocument* doc = NULL;
-	const gchar* _tmp0_;
-	PublishingRESTSupportXmlDocument* _tmp1_;
+	PublishingRESTSupportXmlDocument* _tmp0_;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp2_;
-	xmlNode* _tmp3_;
+	PublishingRESTSupportXmlDocument* _tmp1_;
+	xmlNode* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (data != NULL);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = data;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
+	_tmp0_ = publishing_rest_support_xml_document_parse_string (data, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	doc = _tmp1_;
+	doc = _tmp0_;
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3204,7 +3450,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 			g_propagate_error (error, _inner_error_);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3208 "YandexPublishing.c"
+#line 3454 "YandexPublishing.c"
 		} else {
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3212,75 +3458,75 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 			g_clear_error (&_inner_error_);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3216 "YandexPublishing.c"
+#line 3462 "YandexPublishing.c"
 		}
 	}
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = doc;
+	_tmp1_ = doc;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
+	_tmp2_ = publishing_rest_support_xml_document_get_root_node (_tmp1_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	root = _tmp3_;
-#line 3225 "YandexPublishing.c"
+	root = _tmp2_;
+#line 3471 "YandexPublishing.c"
 	{
 		xmlNode* e = NULL;
+		xmlNode* _tmp3_;
 		xmlNode* _tmp4_;
-		xmlNode* _tmp5_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp4_ = root;
+		_tmp3_ = root;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = _tmp4_->children;
+		_tmp4_ = _tmp3_->children;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		e = _tmp5_;
-#line 3236 "YandexPublishing.c"
+		e = _tmp4_;
+#line 3482 "YandexPublishing.c"
 		{
-			gboolean _tmp6_ = FALSE;
+			gboolean _tmp5_ = FALSE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp6_ = TRUE;
+			_tmp5_ = TRUE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 3243 "YandexPublishing.c"
+#line 3489 "YandexPublishing.c"
+				xmlNode* _tmp8_;
 				xmlNode* _tmp9_;
-				xmlNode* _tmp10_;
-				const gchar* _tmp11_;
-				xmlNode* _tmp12_;
+				const gchar* _tmp10_;
+				xmlNode* _tmp11_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (!_tmp6_) {
-#line 3250 "YandexPublishing.c"
+				if (!_tmp5_) {
+#line 3496 "YandexPublishing.c"
+					xmlNode* _tmp6_;
 					xmlNode* _tmp7_;
-					xmlNode* _tmp8_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp7_ = e;
+					_tmp6_ = e;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp8_ = _tmp7_->next;
+					_tmp7_ = _tmp6_->next;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					e = _tmp8_;
-#line 3259 "YandexPublishing.c"
+					e = _tmp7_;
+#line 3505 "YandexPublishing.c"
 				}
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp6_ = FALSE;
+				_tmp5_ = FALSE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp9_ = e;
+				_tmp8_ = e;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (!(_tmp9_ != NULL)) {
+				if (!(_tmp8_ != NULL)) {
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3269 "YandexPublishing.c"
+#line 3515 "YandexPublishing.c"
 				}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp10_ = e;
+				_tmp9_ = e;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp11_ = _tmp10_->name;
+				_tmp10_ = _tmp9_->name;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (g_strcmp0 (_tmp11_, "entry") != 0) {
+				if (g_strcmp0 (_tmp10_, "entry") != 0) {
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					continue;
-#line 3279 "YandexPublishing.c"
+#line 3525 "YandexPublishing.c"
 				}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp12_ = e;
+				_tmp11_ = e;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp12_, &_inner_error_);
+				publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp11_, &_inner_error_);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3291,7 +3537,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3295 "YandexPublishing.c"
+#line 3541 "YandexPublishing.c"
 					} else {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
@@ -3301,7 +3547,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 						g_clear_error (&_inner_error_);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3305 "YandexPublishing.c"
+#line 3551 "YandexPublishing.c"
 					}
 				}
 			}
@@ -3309,106 +3555,102 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3313 "YandexPublishing.c"
+#line 3559 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                           gpointer self)
+{
 #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3320 "YandexPublishing.c"
+#line 3569 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                            GError* err,
+                                                                                                            gpointer self)
+{
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3327 "YandexPublishing.c"
+#line 3580 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self,
+                                                         PublishingRESTSupportTransaction* t,
+                                                         GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	GError* _tmp4_;
-	const gchar* _tmp5_;
+	const gchar* _tmp2_;
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
 #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = t;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = t;
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = err;
+	_tmp2_ = err->message;
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = _tmp4_->message;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_);
-#line 3360 "YandexPublishing.c"
+	g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp2_);
+#line 3608 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self,
+                                                            PublishingRESTSupportTransaction* t)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	GeeHashMap* _tmp9_;
-	PublishingYandexPublishOptions* _tmp10_;
-	const gchar* _tmp11_;
-	gpointer _tmp12_;
-	gchar* _tmp13_;
-	gboolean _tmp14_;
+	GeeHashMap* _tmp6_;
+	PublishingYandexPublishOptions* _tmp7_;
+	const gchar* _tmp8_;
+	gpointer _tmp9_;
+	gchar* _tmp10_;
+	gboolean _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = t;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = t;
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 3392 "YandexPublishing.c"
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
+#line 3637 "YandexPublishing.c"
 	{
-		PublishingRESTSupportTransaction* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp4_ = t;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+		_tmp2_ = publishing_rest_support_transaction_get_response (t);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = _tmp5_;
+		_tmp3_ = _tmp2_;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		publishing_yandex_yandex_publisher_parse_album_creation (self, _tmp6_, &_inner_error_);
+		publishing_yandex_yandex_publisher_parse_album_creation (self, _tmp3_, &_inner_error_);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp6_);
+		_g_free0 (_tmp3_);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3411 "YandexPublishing.c"
-				goto __catch42_spit_publishing_publishing_error;
+#line 3653 "YandexPublishing.c"
+				goto __catch35_spit_publishing_publishing_error;
 			}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3416,32 +3658,32 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3420 "YandexPublishing.c"
+#line 3662 "YandexPublishing.c"
 		}
 	}
-	goto __finally42;
-	__catch42_spit_publishing_publishing_error:
+	goto __finally35;
+	__catch35_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_;
-		GError* _tmp8_;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = self->priv->host;
+		_tmp4_ = self->priv->host;
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp8_ = err;
+		_tmp5_ = err;
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3443 "YandexPublishing.c"
+#line 3685 "YandexPublishing.c"
 	}
-	__finally42:
+	__finally35:
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3450,47 +3692,49 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		g_clear_error (&_inner_error_);
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3454 "YandexPublishing.c"
+#line 3696 "YandexPublishing.c"
 	}
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp9_ = self->priv->album_list;
+	_tmp6_ = self->priv->album_list;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp10_ = self->priv->options;
+	_tmp7_ = self->priv->options;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp11_ = _tmp10_->destination_album;
+	_tmp8_ = _tmp7_->destination_album;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_);
+	_tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp13_ = (gchar*) _tmp12_;
+	_tmp10_ = (gchar*) _tmp9_;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp14_ = _tmp13_ != NULL;
+	_tmp11_ = _tmp10_ != NULL;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp13_);
+	_g_free0 (_tmp10_);
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	if (_tmp14_) {
+	if (_tmp11_) {
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3474 "YandexPublishing.c"
+#line 3716 "YandexPublishing.c"
 	} else {
-		SpitPublishingPluginHost* _tmp15_;
-		GError* _tmp16_;
-		GError* _tmp17_;
+		SpitPublishingPluginHost* _tmp12_;
+		GError* _tmp13_;
+		GError* _tmp14_;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp15_ = self->priv->host;
+		_tmp12_ = self->priv->host;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR, "Server did not create album");
+		_tmp13_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR, "Server did not create album");
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp17_ = _tmp16_;
+		_tmp14_ = _tmp13_;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
+		spit_publishing_plugin_host_post_error (_tmp12_, _tmp14_);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_error_free0 (_tmp17_);
-#line 3489 "YandexPublishing.c"
+		_g_error_free0 (_tmp14_);
+#line 3731 "YandexPublishing.c"
 	}
 }
 
 
-static void publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self)
+{
 	gchar* album = NULL;
 	PublishingYandexPublishOptions* _tmp0_;
 	const gchar* _tmp1_;
@@ -3531,7 +3775,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3534 "YandexPublishing.c"
+#line 3778 "YandexPublishing.c"
 	{
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3539,8 +3783,8 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3542 "YandexPublishing.c"
-				goto __catch43_spit_publishing_publishing_error;
+#line 3786 "YandexPublishing.c"
+				goto __catch36_spit_publishing_publishing_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
@@ -3554,11 +3798,11 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 			g_clear_error (&_inner_error_);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3557 "YandexPublishing.c"
+#line 3801 "YandexPublishing.c"
 		}
 	}
-	goto __finally43;
-	__catch43_spit_publishing_publishing_error:
+	goto __finally36;
+	__catch36_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_;
@@ -3575,9 +3819,9 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 3578 "YandexPublishing.c"
+#line 3822 "YandexPublishing.c"
 	}
-	__finally43:
+	__finally36:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3592,7 +3836,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3595 "YandexPublishing.c"
+#line 3839 "YandexPublishing.c"
 	}
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
@@ -3600,156 +3844,155 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 	_g_free0 (data);
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (album);
-#line 3603 "YandexPublishing.c"
+#line 3847 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                               gint num_photos_published,
+                                                                                                               gpointer self)
+{
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published);
-#line 3610 "YandexPublishing.c"
+#line 3858 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                         GError* err,
+                                                                                                         gpointer self)
+{
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3617 "YandexPublishing.c"
+#line 3869 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self,
+                                                       PublishingRESTSupportBatchUploader* uploader,
+                                                       gint num_published)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	gint _tmp4_;
-	SpitPublishingPluginHost* _tmp8_;
-	SpitPublishingPluginHost* _tmp9_;
+	SpitPublishingPluginHost* _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = uploader;
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	if (_tmp4_ == 0) {
-#line 3649 "YandexPublishing.c"
-		SpitPublishingPluginHost* _tmp5_;
-		GError* _tmp6_;
-		GError* _tmp7_;
+	if (num_published == 0) {
+#line 3896 "YandexPublishing.c"
+		SpitPublishingPluginHost* _tmp2_;
+		GError* _tmp3_;
+		GError* _tmp4_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = self->priv->host;
+		_tmp2_ = self->priv->host;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "");
+		_tmp3_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "");
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = _tmp6_;
+		_tmp4_ = _tmp3_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
+		spit_publishing_plugin_host_post_error (_tmp2_, _tmp4_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_error_free0 (_tmp7_);
-#line 3663 "YandexPublishing.c"
+		_g_error_free0 (_tmp4_);
+#line 3910 "YandexPublishing.c"
 	}
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp8_ = self->priv->host;
+	_tmp5_ = self->priv->host;
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp8_, FALSE);
+	spit_publishing_plugin_host_set_service_locked (_tmp5_, FALSE);
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp9_ = self->priv->host;
+	_tmp6_ = self->priv->host;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3673 "YandexPublishing.c"
+	spit_publishing_plugin_host_install_success_pane (_tmp6_);
+#line 3920 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self,
+                                                    PublishingRESTSupportBatchUploader* uploader,
+                                                    GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	GError* _tmp4_;
-	const gchar* _tmp5_;
+	const gchar* _tmp2_;
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = uploader;
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = _tmp4_->message;
+	_tmp2_ = err->message;
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
-#line 3706 "YandexPublishing.c"
+	g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp2_);
+#line 3948 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self, gint file_number, gdouble completed_fraction) {
-	gdouble _tmp0_;
+static void
+publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self,
+                                                             gint file_number,
+                                                             gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
 	SpitPublishingProgressCallback _tmp1_;
 	void* _tmp1__target;
-	SpitPublishingProgressCallback _tmp2_;
-	void* _tmp2__target;
-	gint _tmp3_;
-	gdouble _tmp4_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = completed_fraction;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:452: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp0_);
+" complete.", 100.0 * completed_fraction);
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = self->priv->progress_reporter;
+	_tmp0_ = self->priv->progress_reporter;
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1__target = self->priv->progress_reporter_target;
+	_tmp0__target = self->priv->progress_reporter_target;
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = self->priv->progress_reporter;
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = file_number;
+	_tmp1_ = self->priv->progress_reporter;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = completed_fraction;
+	_tmp1__target = self->priv->progress_reporter_target;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 3740 "YandexPublishing.c"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 3977 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                gdouble fraction_complete,
+                                                                                                gpointer self)
+{
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete);
-#line 3747 "YandexPublishing.c"
+#line 3988 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	void* _tmp2_;
@@ -3836,38 +4079,39 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3838 "YandexPublishing.c"
+#line 4081 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self) {
-	gboolean _tmp0_;
-	PublishingYandexSession* _tmp1_;
+static void
+publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self)
+{
+	PublishingYandexSession* _tmp0_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3853 "YandexPublishing.c"
+#line 4095 "YandexPublishing.c"
 	}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = self->priv->session;
+	_tmp0_ = self->priv->session;
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_yandex_session_deauthenticate (_tmp1_);
+	publishing_yandex_session_deauthenticate (_tmp0_);
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = FALSE;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3865 "YandexPublishing.c"
+#line 4107 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self)
+{
 	PublishingYandexPublishOptions* _tmp0_;
 	const gchar* _tmp1_;
 	GeeHashMap* _tmp2_;
@@ -3919,140 +4163,139 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
 	if (_tmp12_) {
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_create_destination_album (self);
-#line 3921 "YandexPublishing.c"
+#line 4165 "YandexPublishing.c"
 	} else {
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3925 "YandexPublishing.c"
+#line 4169 "YandexPublishing.c"
 	}
 }
 
 
-static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                   gpointer self)
+{
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3933 "YandexPublishing.c"
+#line 4180 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                    GError* err,
+                                                                                                                    gpointer self)
+{
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3940 "YandexPublishing.c"
+#line 4191 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self,
+                                                                 PublishingRESTSupportTransaction* t,
+                                                                 GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	GError* _tmp4_;
-	const gchar* _tmp5_;
+	const gchar* _tmp2_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = t;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = t;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = err;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = _tmp4_->message;
+	_tmp2_ = err->message;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_);
-#line 3975 "YandexPublishing.c"
+	g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp2_);
+#line 4221 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender,
+                                                                                                  gpointer self)
+{
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self);
-#line 3982 "YandexPublishing.c"
+#line 4231 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender,
+                                                                                                gpointer self)
+{
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self);
-#line 3989 "YandexPublishing.c"
+#line 4241 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self,
+                                                                    PublishingRESTSupportTransaction* t)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	PublishingYandexPublishingOptionsPane* publishing_options_pane = NULL;
-	PublishingYandexPublishOptions* _tmp12_;
-	GeeHashMap* _tmp13_;
-	SpitPublishingPluginHost* _tmp14_;
-	PublishingYandexPublishingOptionsPane* _tmp15_;
-	SpitPublishingPluginHost* _tmp16_;
+	PublishingYandexPublishOptions* _tmp8_;
+	GeeHashMap* _tmp9_;
+	SpitPublishingPluginHost* _tmp10_;
+	PublishingYandexPublishingOptionsPane* _tmp11_;
+	SpitPublishingPluginHost* _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = t;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = t;
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
 #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = t;
+	_tmp2_ = publishing_rest_support_transaction_get_response (t);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
+	g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp3_);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 4034 "YandexPublishing.c"
+	_g_free0 (_tmp3_);
+#line 4280 "YandexPublishing.c"
 	{
-		PublishingRESTSupportTransaction* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = t;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+		_tmp4_ = publishing_rest_support_transaction_get_response (t);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp5_ = _tmp4_;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		publishing_yandex_yandex_publisher_parse_album_list (self, _tmp9_, &_inner_error_);
+		publishing_yandex_yandex_publisher_parse_album_list (self, _tmp5_, &_inner_error_);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp5_);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4053 "YandexPublishing.c"
-				goto __catch44_spit_publishing_publishing_error;
+#line 4296 "YandexPublishing.c"
+				goto __catch37_spit_publishing_publishing_error;
 			}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4060,30 +4303,30 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 			g_clear_error (&_inner_error_);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4062 "YandexPublishing.c"
+#line 4305 "YandexPublishing.c"
 		}
 	}
-	goto __finally44;
-	__catch44_spit_publishing_publishing_error:
+	goto __finally37;
+	__catch37_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp10_;
-		GError* _tmp11_;
+		SpitPublishingPluginHost* _tmp6_;
+		GError* _tmp7_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp10_ = self->priv->host;
+		_tmp6_ = self->priv->host;
 #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp11_ = err;
+		_tmp7_ = err;
 #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
+		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4083 "YandexPublishing.c"
+#line 4326 "YandexPublishing.c"
 	}
-	__finally44:
+	__finally37:
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4092,65 +4335,62 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		g_clear_error (&_inner_error_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4094 "YandexPublishing.c"
+#line 4337 "YandexPublishing.c"
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp12_ = self->priv->options;
+	_tmp8_ = self->priv->options;
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp13_ = self->priv->album_list;
+	_tmp9_ = self->priv->album_list;
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp14_ = self->priv->host;
+	_tmp10_ = self->priv->host;
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp15_ = publishing_yandex_publishing_options_pane_new (_tmp12_, _tmp13_, _tmp14_);
+	_tmp11_ = publishing_yandex_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_);
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_options_pane = _tmp15_;
+	publishing_options_pane = _tmp11_;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish, self, 0);
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout, self, 0);
 #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp16_ = self->priv->host;
+	_tmp12_ = self->priv->host;
 #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (publishing_options_pane);
-#line 4116 "YandexPublishing.c"
+#line 4359 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self, const gchar* url) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self,
+                                                           const gchar* url)
+{
+	gchar* _tmp0_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp2_;
-	const gchar* _tmp3_;
-	PublishingYandexTransaction* _tmp4_;
+	PublishingYandexSession* _tmp1_;
+	PublishingYandexTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (url != NULL);
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = url;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (url);
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->priv->service_url);
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->service_url = _tmp1_;
+	self->priv->service_url = _tmp0_;
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = self->priv->session;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = url;
+	_tmp1_ = self->priv->session;
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = publishing_yandex_transaction_new_with_url (_tmp2_, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	_tmp2_ = publishing_yandex_transaction_new_with_url (_tmp1_, url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	t = _tmp4_;
+	t = _tmp2_;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4152 "YandexPublishing.c"
+#line 4392 "YandexPublishing.c"
 	{
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4158,8 +4398,8 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4160 "YandexPublishing.c"
-				goto __catch45_spit_publishing_publishing_error;
+#line 4400 "YandexPublishing.c"
+				goto __catch38_spit_publishing_publishing_error;
 			}
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
@@ -4169,30 +4409,30 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 			g_clear_error (&_inner_error_);
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4171 "YandexPublishing.c"
+#line 4411 "YandexPublishing.c"
 		}
 	}
-	goto __finally45;
-	__catch45_spit_publishing_publishing_error:
+	goto __finally38;
+	__catch38_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp5_;
-		GError* _tmp6_;
+		SpitPublishingPluginHost* _tmp3_;
+		GError* _tmp4_;
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = self->priv->host;
+		_tmp3_ = self->priv->host;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = err;
+		_tmp4_ = err;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
+		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4192 "YandexPublishing.c"
+#line 4432 "YandexPublishing.c"
 	}
-	__finally45:
+	__finally38:
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4203,127 +4443,120 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		g_clear_error (&_inner_error_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4205 "YandexPublishing.c"
+#line 4445 "YandexPublishing.c"
 	}
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4209 "YandexPublishing.c"
+#line 4449 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                          gpointer self)
+{
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4216 "YandexPublishing.c"
+#line 4459 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                           GError* err,
+                                                                                                           gpointer self)
+{
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4223 "YandexPublishing.c"
+#line 4470 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self,
+                                                        PublishingRESTSupportTransaction* t,
+                                                        GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	GError* _tmp4_;
-	const gchar* _tmp5_;
+	const gchar* _tmp2_;
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = t;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = t;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = err;
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = _tmp4_->message;
+	_tmp2_ = err->message;
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_);
-#line 4256 "YandexPublishing.c"
+	g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp2_);
+#line 4498 "YandexPublishing.c"
 }
 
 
-void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self,
+                                                           PublishingRESTSupportTransaction* t)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = t;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = t;
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = t;
+	_tmp2_ = publishing_rest_support_transaction_get_response (t);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
+	g_debug ("YandexPublishing.vala:545: account info: %s", _tmp3_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 4295 "YandexPublishing.c"
+	_g_free0 (_tmp3_);
+#line 4531 "YandexPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		PublishingRESTSupportXmlDocument* _tmp10_;
-		PublishingRESTSupportXmlDocument* _tmp11_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		PublishingRESTSupportXmlDocument* _tmp7_;
 		xmlNode* root = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_;
-		xmlNode* _tmp13_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = t;
+		_tmp4_ = publishing_rest_support_transaction_get_response (t);
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp5_ = _tmp4_;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
+		_tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp11_ = _tmp10_;
+		_tmp7_ = _tmp6_;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp5_);
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		doc = _tmp11_;
+		doc = _tmp7_;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4324 "YandexPublishing.c"
-				goto __catch46_spit_publishing_publishing_error;
+#line 4557 "YandexPublishing.c"
+				goto __catch39_spit_publishing_publishing_error;
 			}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4331,172 +4564,172 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 			g_clear_error (&_inner_error_);
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4333 "YandexPublishing.c"
+#line 4566 "YandexPublishing.c"
 		}
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp12_ = doc;
+		_tmp8_ = doc;
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+		_tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		root = _tmp13_;
-#line 4341 "YandexPublishing.c"
+		root = _tmp9_;
+#line 4574 "YandexPublishing.c"
 		{
 			xmlNode* work = NULL;
-			xmlNode* _tmp14_;
-			xmlNode* _tmp15_;
+			xmlNode* _tmp10_;
+			xmlNode* _tmp11_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp14_ = root;
+			_tmp10_ = root;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp15_ = _tmp14_->children;
+			_tmp11_ = _tmp10_->children;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			work = _tmp15_;
-#line 4352 "YandexPublishing.c"
+			work = _tmp11_;
+#line 4585 "YandexPublishing.c"
 			{
-				gboolean _tmp16_ = FALSE;
+				gboolean _tmp12_ = FALSE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp16_ = TRUE;
+				_tmp12_ = TRUE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				while (TRUE) {
-#line 4359 "YandexPublishing.c"
-					xmlNode* _tmp19_;
-					xmlNode* _tmp20_;
-					const gchar* _tmp21_;
+#line 4592 "YandexPublishing.c"
+					xmlNode* _tmp15_;
+					xmlNode* _tmp16_;
+					const gchar* _tmp17_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					if (!_tmp16_) {
-#line 4365 "YandexPublishing.c"
-						xmlNode* _tmp17_;
-						xmlNode* _tmp18_;
+					if (!_tmp12_) {
+#line 4598 "YandexPublishing.c"
+						xmlNode* _tmp13_;
+						xmlNode* _tmp14_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-						_tmp17_ = work;
+						_tmp13_ = work;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-						_tmp18_ = _tmp17_->next;
+						_tmp14_ = _tmp13_->next;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-						work = _tmp18_;
-#line 4374 "YandexPublishing.c"
+						work = _tmp14_;
+#line 4607 "YandexPublishing.c"
 					}
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp16_ = FALSE;
+					_tmp12_ = FALSE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp19_ = work;
+					_tmp15_ = work;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					if (!(_tmp19_ != NULL)) {
+					if (!(_tmp15_ != NULL)) {
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						break;
-#line 4384 "YandexPublishing.c"
+#line 4617 "YandexPublishing.c"
 					}
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp20_ = work;
+					_tmp16_ = work;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp21_ = _tmp20_->name;
+					_tmp17_ = _tmp16_->name;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					if (g_strcmp0 (_tmp21_, "workspace") != 0) {
+					if (g_strcmp0 (_tmp17_, "workspace") != 0) {
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						continue;
-#line 4394 "YandexPublishing.c"
+#line 4627 "YandexPublishing.c"
 					}
 					{
 						xmlNode* c = NULL;
-						xmlNode* _tmp22_;
-						xmlNode* _tmp23_;
+						xmlNode* _tmp18_;
+						xmlNode* _tmp19_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-						_tmp22_ = work;
+						_tmp18_ = work;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-						_tmp23_ = _tmp22_->children;
+						_tmp19_ = _tmp18_->children;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-						c = _tmp23_;
-#line 4406 "YandexPublishing.c"
+						c = _tmp19_;
+#line 4639 "YandexPublishing.c"
 						{
-							gboolean _tmp24_ = FALSE;
+							gboolean _tmp20_ = FALSE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-							_tmp24_ = TRUE;
+							_tmp20_ = TRUE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							while (TRUE) {
-#line 4413 "YandexPublishing.c"
-								xmlNode* _tmp27_;
-								xmlNode* _tmp28_;
-								const gchar* _tmp29_;
-								xmlNode* _tmp30_;
-								gchar* _tmp31_;
-								gchar* _tmp32_;
-								gboolean _tmp33_;
+#line 4646 "YandexPublishing.c"
+								xmlNode* _tmp23_;
+								xmlNode* _tmp24_;
+								const gchar* _tmp25_;
+								xmlNode* _tmp26_;
+								gchar* _tmp27_;
+								gchar* _tmp28_;
+								gboolean _tmp29_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								if (!_tmp24_) {
-#line 4423 "YandexPublishing.c"
-									xmlNode* _tmp25_;
-									xmlNode* _tmp26_;
+								if (!_tmp20_) {
+#line 4656 "YandexPublishing.c"
+									xmlNode* _tmp21_;
+									xmlNode* _tmp22_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp25_ = c;
+									_tmp21_ = c;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp26_ = _tmp25_->next;
+									_tmp22_ = _tmp21_->next;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									c = _tmp26_;
-#line 4432 "YandexPublishing.c"
+									c = _tmp22_;
+#line 4665 "YandexPublishing.c"
 								}
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp24_ = FALSE;
+								_tmp20_ = FALSE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp27_ = c;
+								_tmp23_ = c;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								if (!(_tmp27_ != NULL)) {
+								if (!(_tmp23_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4442 "YandexPublishing.c"
+#line 4675 "YandexPublishing.c"
 								}
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp28_ = c;
+								_tmp24_ = c;
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp29_ = _tmp28_->name;
+								_tmp25_ = _tmp24_->name;
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								if (g_strcmp0 (_tmp29_, "collection") != 0) {
+								if (g_strcmp0 (_tmp25_, "collection") != 0) {
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									continue;
-#line 4452 "YandexPublishing.c"
+#line 4685 "YandexPublishing.c"
 								}
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp30_ = c;
+								_tmp26_ = c;
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp31_ = (gchar*) xmlGetProp (_tmp30_, (xmlChar*) "id");
+								_tmp27_ = (gchar*) xmlGetProp (_tmp26_, (xmlChar*) "id");
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp32_ = _tmp31_;
+								_tmp28_ = _tmp27_;
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_tmp33_ = g_strcmp0 (_tmp32_, "album-list") == 0;
+								_tmp29_ = g_strcmp0 (_tmp28_, "album-list") == 0;
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								_g_free0 (_tmp32_);
+								_g_free0 (_tmp28_);
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-								if (_tmp33_) {
-#line 4466 "YandexPublishing.c"
+								if (_tmp29_) {
+#line 4699 "YandexPublishing.c"
 									gchar* url = NULL;
-									xmlNode* _tmp34_;
-									gchar* _tmp35_;
-									PublishingYandexSession* _tmp36_;
-									gchar* _tmp37_;
-									gchar* _tmp38_;
-									const gchar* _tmp39_;
+									xmlNode* _tmp30_;
+									gchar* _tmp31_;
+									PublishingYandexSession* _tmp32_;
+									gchar* _tmp33_;
+									gchar* _tmp34_;
+									const gchar* _tmp35_;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp34_ = c;
+									_tmp30_ = c;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp35_ = (gchar*) xmlGetProp (_tmp34_, (xmlChar*) "href");
+									_tmp31_ = (gchar*) xmlGetProp (_tmp30_, (xmlChar*) "href");
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									url = _tmp35_;
+									url = _tmp31_;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp36_ = self->priv->session;
+									_tmp32_ = self->priv->session;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp37_ = publishing_yandex_session_get_auth_token (_tmp36_);
+									_tmp33_ = publishing_yandex_session_get_auth_token (_tmp32_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp38_ = _tmp37_;
+									_tmp34_ = _tmp33_;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									publishing_yandex_yandex_publisher_set_persistent_auth_token (self, _tmp38_);
+									publishing_yandex_yandex_publisher_set_persistent_auth_token (self, _tmp34_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_g_free0 (_tmp38_);
+									_g_free0 (_tmp34_);
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									_tmp39_ = url;
+									_tmp35_ = url;
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-									publishing_yandex_yandex_publisher_service_get_album_list (self, _tmp39_);
+									publishing_yandex_yandex_publisher_service_get_album_list (self, _tmp35_);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_g_free0 (url);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4498 "YandexPublishing.c"
+#line 4731 "YandexPublishing.c"
 								}
 							}
 						}
@@ -4506,29 +4739,29 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		}
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4508 "YandexPublishing.c"
+#line 4741 "YandexPublishing.c"
 	}
-	goto __finally46;
-	__catch46_spit_publishing_publishing_error:
+	goto __finally39;
+	__catch39_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp40_;
-		GError* _tmp41_;
+		SpitPublishingPluginHost* _tmp36_;
+		GError* _tmp37_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp40_ = self->priv->host;
+		_tmp36_ = self->priv->host;
 #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp41_ = err;
+		_tmp37_ = err;
 #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
+		spit_publishing_plugin_host_post_error (_tmp36_, _tmp37_);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4528 "YandexPublishing.c"
+#line 4761 "YandexPublishing.c"
 	}
-	__finally46:
+	__finally39:
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4537,17 +4770,19 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		g_clear_error (&_inner_error_);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4539 "YandexPublishing.c"
+#line 4772 "YandexPublishing.c"
 	}
 }
 
 
-void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
+void
+publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self,
+                                                              const gchar* auth_token)
+{
 	PublishingYandexSession* _tmp0_;
-	const gchar* _tmp1_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp2_;
-	PublishingYandexTransaction* _tmp3_;
+	PublishingYandexSession* _tmp1_;
+	PublishingYandexTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4556,20 +4791,18 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->session;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = auth_token;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_yandex_session_set_auth_token (_tmp0_, _tmp1_);
+	publishing_yandex_session_set_auth_token (_tmp0_, auth_token);
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = self->priv->session;
+	_tmp1_ = self->priv->session;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = publishing_yandex_transaction_new_with_url (_tmp2_, "https://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	_tmp2_ = publishing_yandex_transaction_new_with_url (_tmp1_, "https://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	t = _tmp3_;
+	t = _tmp2_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4571 "YandexPublishing.c"
+#line 4804 "YandexPublishing.c"
 	{
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4577,8 +4810,8 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4579 "YandexPublishing.c"
-				goto __catch47_spit_publishing_publishing_error;
+#line 4812 "YandexPublishing.c"
+				goto __catch40_spit_publishing_publishing_error;
 			}
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
@@ -4588,30 +4821,30 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 			g_clear_error (&_inner_error_);
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4590 "YandexPublishing.c"
+#line 4823 "YandexPublishing.c"
 		}
 	}
-	goto __finally47;
-	__catch47_spit_publishing_publishing_error:
+	goto __finally40;
+	__catch40_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_;
-		GError* _tmp5_;
+		SpitPublishingPluginHost* _tmp3_;
+		GError* _tmp4_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp4_ = self->priv->host;
+		_tmp3_ = self->priv->host;
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = err;
+		_tmp4_ = err;
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4611 "YandexPublishing.c"
+#line 4844 "YandexPublishing.c"
 	}
-	__finally47:
+	__finally40:
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4622,67 +4855,75 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		g_clear_error (&_inner_error_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4624 "YandexPublishing.c"
+#line 4857 "YandexPublishing.c"
 	}
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4628 "YandexPublishing.c"
+#line 4861 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self, const gchar* access_token) {
-	const gchar* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self,
+                                                             const gchar* access_token)
+{
+	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	const gchar* _tmp3_;
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (access_token != NULL);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = access_token;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:586: login succeeded with token %s", _tmp0_);
+	g_debug ("YandexPublishing.vala:586: login succeeded with token %s", access_token);
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = self->priv->host;
+	_tmp0_ = self->priv->host;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = self->priv->host;
+	_tmp1_ = self->priv->host;
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp2_);
+	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = access_token;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_);
-#line 4657 "YandexPublishing.c"
+	publishing_yandex_yandex_publisher_fetch_account_information (self, access_token);
+#line 4887 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self)
+{
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:595: login failed");
-#line 4666 "YandexPublishing.c"
+#line 4898 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender,
+                                                                                                              const gchar* success_url,
+                                                                                                              gpointer self)
+{
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4673 "YandexPublishing.c"
+#line 4909 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender,
+                                                                                                        gpointer self)
+{
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self);
-#line 4680 "YandexPublishing.c"
+#line 4919 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
@@ -4723,18 +4964,22 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
 	_tmp7_ = self->priv->web_auth_pane;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 4725 "YandexPublishing.c"
+#line 4966 "YandexPublishing.c"
 }
 
 
-static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self)
+{
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self);
-#line 4732 "YandexPublishing.c"
+#line 4975 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4742,76 +4987,74 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand
 	_tmp0_ = self->priv->host;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _ ("You are not currently logged into Yandex.Fotki."), _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 4744 "YandexPublishing.c"
+#line 4989 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base)
+{
 	PublishingYandexYandexPublisher * self;
-	gboolean _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	gboolean _tmp2_;
+	SpitPublishingPluginHost* _tmp0_;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	if (_tmp0_) {
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4761 "YandexPublishing.c"
+#line 5004 "YandexPublishing.c"
 	}
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = self->priv->host;
+	_tmp0_ = self->priv->host;
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	if (_tmp1_ == NULL) {
+	if (_tmp0_ == NULL) {
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 4769 "YandexPublishing.c"
+#line 5012 "YandexPublishing.c"
 	}
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = TRUE;
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	if (_tmp2_) {
-#line 4779 "YandexPublishing.c"
-		PublishingYandexSession* _tmp3_;
+	if (publishing_yandex_yandex_publisher_is_persistent_session_available (self)) {
+#line 5020 "YandexPublishing.c"
+		PublishingYandexSession* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-		gchar* _tmp6_;
-		gchar* _tmp7_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp3_ = self->priv->session;
+		_tmp1_ = self->priv->session;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp4_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
+		_tmp2_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = _tmp2_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		publishing_yandex_session_set_auth_token (_tmp3_, _tmp5_);
+		publishing_yandex_session_set_auth_token (_tmp1_, _tmp3_);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp3_);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
+		_tmp4_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = _tmp4_;
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
+		publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp5_);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_free0 (_tmp7_);
-#line 4803 "YandexPublishing.c"
+		_g_free0 (_tmp5_);
+#line 5044 "YandexPublishing.c"
 	} else {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 4807 "YandexPublishing.c"
+#line 5048 "YandexPublishing.c"
 	}
 }
 
 
-static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base)
+{
 	PublishingYandexYandexPublisher * self;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
@@ -4821,22 +5064,26 @@ static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublishe
 	self->priv->host = NULL;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = FALSE;
-#line 4822 "YandexPublishing.c"
+#line 5065 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYandexPublisherClass * klass) {
+static void
+publishing_yandex_yandex_publisher_class_init (PublishingYandexYandexPublisherClass * klass)
+{
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_parent_class = g_type_class_peek_parent (klass);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate));
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize;
-#line 4833 "YandexPublishing.c"
+#line 5078 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_yandex_yandex_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4847,11 +5094,13 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa
 	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_start;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_stop;
-#line 4848 "YandexPublishing.c"
+#line 5095 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYandexPublisher * self) {
+static void
+publishing_yandex_yandex_publisher_instance_init (PublishingYandexYandexPublisher * self)
+{
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE (self);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4872,11 +5121,13 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa
 	self->priv->running = FALSE;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->web_auth_pane = NULL;
-#line 4873 "YandexPublishing.c"
+#line 5122 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_finalize (GObject * obj) {
+static void
+publishing_yandex_yandex_publisher_finalize (GObject * obj)
+{
 	PublishingYandexYandexPublisher * self;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
@@ -4900,11 +5151,13 @@ static void publishing_yandex_yandex_publisher_finalize (GObject * obj) {
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj);
-#line 4901 "YandexPublishing.c"
+#line 5152 "YandexPublishing.c"
 }
 
 
-GType publishing_yandex_yandex_publisher_get_type (void) {
+GType
+publishing_yandex_yandex_publisher_get_type (void)
+{
 	static volatile gsize publishing_yandex_yandex_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_yandex_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexYandexPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_yandex_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexYandexPublisher), 0, (GInstanceInitFunc) publishing_yandex_yandex_publisher_instance_init, NULL };
@@ -4918,7 +5171,11 @@ GType publishing_yandex_yandex_publisher_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) {
@@ -4930,13 +5187,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-extras/gallery3_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
index 8662f8c..f27fd2d 100644
--- a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
@@ -156,7 +156,7 @@
             <property name="can_focus">False</property>
             <items>
               <item translatable="yes">Original size</item>
-              <item translatable="yes">Width or height</item>
+              <item translatable="yes">Longest edge</item>
             </items>
           </object>
           <packing>
diff --git a/plugins/shotwell-publishing-extras/meson.build b/plugins/shotwell-publishing-extras/meson.build
new file mode 100644
index 0000000..34f3e12
--- /dev/null
+++ b/plugins/shotwell-publishing-extras/meson.build
@@ -0,0 +1,21 @@
+shotwell_publishing_extra_sources = [
+    'GalleryConnector.vala',
+    'RajcePublishing.vala',
+    'shotwell-publishing-extras.vala',
+    'YandexPublishing.vala'
+    ]
+
+shotwell_publishing_extra_resources = gnome.compile_resources('publishing-extra-resource',
+        'org.gnome.Shotwell.Publishing.Extras.gresource.xml')
+
+shared_module('shotwell-publishing-extras',
+              shotwell_publishing_extra_sources + shotwell_publishing_extra_resources,
+              dependencies : [gee, gtk, xml, soup, gdk_pixbuf, sw_plugin,
+                              sw_plugin_common_dep, json_glib, webkit],
+              vala_args : [
+                  '--gresources', 'org.gnome.Shotwell.Publishing.Extras.gresource.xml'
+                  ],
+              c_args : ['-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Publishing/Extras"',
+                        '-DGCR_API_SUBJECT_TO_CHANGE'],
+              install: true,
+              install_dir : shotwell_plugin_dir)
diff --git a/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml b/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
index ab8a367..5916f82 100644
--- a/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
+++ b/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
@@ -3,13 +3,10 @@
     <gresource prefix="/org/gnome/Shotwell/Publishing/Extras">
         <file>gallery3.png</file>
         <file>rajce.png</file>
-        <file>tumblr.png</file>
         <file>gallery3_authentication_pane.ui</file>
         <file>gallery3_publishing_options_pane.ui</file>
         <file>rajce_authentication_pane.ui</file>
         <file>rajce_publishing_options_pane.ui</file>
-        <file>tumblr_authentication_pane.ui</file>
-        <file>tumblr_publishing_options_pane.ui</file>
         <file>yandex_publish_model.ui</file>
     </gresource>
 </gresources>
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
index 04cf9d3..e873272 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing-extras.c generated by valac 0.36.6, the Vala compiler
+/* shotwell-publishing-extras.c generated by valac 0.40.4, the Vala compiler
  * generated from shotwell-publishing-extras.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>
@@ -26,37 +27,11 @@
 typedef struct _ShotwellPublishingExtraServices ShotwellPublishingExtraServices;
 typedef struct _ShotwellPublishingExtraServicesClass ShotwellPublishingExtraServicesClass;
 typedef struct _ShotwellPublishingExtraServicesPrivate ShotwellPublishingExtraServicesPrivate;
-
-#define TYPE_YANDEX_SERVICE (yandex_service_get_type ())
-#define YANDEX_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_YANDEX_SERVICE, YandexService))
-#define YANDEX_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_YANDEX_SERVICE, YandexServiceClass))
-#define IS_YANDEX_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_YANDEX_SERVICE))
-#define IS_YANDEX_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_YANDEX_SERVICE))
-#define YANDEX_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_YANDEX_SERVICE, YandexServiceClass))
-
-typedef struct _YandexService YandexService;
-typedef struct _YandexServiceClass YandexServiceClass;
-
-#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)))
-
-#define TYPE_RAJCE_SERVICE (rajce_service_get_type ())
-#define RAJCE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RAJCE_SERVICE, RajceService))
-#define RAJCE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RAJCE_SERVICE, RajceServiceClass))
-#define IS_RAJCE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RAJCE_SERVICE))
-#define IS_RAJCE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RAJCE_SERVICE))
-#define RAJCE_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RAJCE_SERVICE, RajceServiceClass))
-
-typedef struct _RajceService RajceService;
-typedef struct _RajceServiceClass RajceServiceClass;
+enum  {
+	SHOTWELL_PUBLISHING_EXTRA_SERVICES_0_PROPERTY,
+	SHOTWELL_PUBLISHING_EXTRA_SERVICES_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_publishing_extra_services_properties[SHOTWELL_PUBLISHING_EXTRA_SERVICES_NUM_PROPERTIES];
 
 #define TYPE_GALLERY3_SERVICE (gallery3_service_get_type ())
 #define GALLERY3_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GALLERY3_SERVICE, Gallery3Service))
@@ -67,6 +42,7 @@ typedef struct _RajceServiceClass RajceServiceClass;
 
 typedef struct _Gallery3Service Gallery3Service;
 typedef struct _Gallery3ServiceClass Gallery3ServiceClass;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 struct _ShotwellPublishingExtraServices {
 	GObject parent_instance;
@@ -89,283 +65,192 @@ static SpitModuleIface * shotwell_publishing_extra_services_spit_module_parent_i
 
 GType shotwell_publishing_extra_services_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServicesPrivate))
-enum  {
-	SHOTWELL_PUBLISHING_EXTRA_SERVICES_DUMMY_PROPERTY
-};
 ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file);
-ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file);
-YandexService* yandex_service_new (void);
-YandexService* yandex_service_construct (GType object_type);
-GType yandex_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add14 (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_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
-RajceService* rajce_service_new (GFile* resource_directory);
-RajceService* rajce_service_construct (GType object_type, GFile* resource_directory);
-GType rajce_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type,
+                                                                               GFile* module_file);
 Gallery3Service* gallery3_service_new (GFile* resource_directory);
-Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory);
+Gallery3Service* gallery3_service_construct (GType object_type,
+                                             GFile* resource_directory);
 GType gallery3_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add14 (SpitPluggable** * array,
+                        int* length,
+                        int* size,
+                        SpitPluggable* value);
 static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base);
 static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base,
+                                                                        int* result_length1);
 static void shotwell_publishing_extra_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_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	if ((*length) == (*size)) {
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 131 "shotwell-publishing-extras.c"
-	}
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[(*length)++] = value;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[*length] = NULL;
-#line 137 "shotwell-publishing-extras.c"
-}
-
-
-static void _vala_array_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	if ((*length) == (*size)) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 148 "shotwell-publishing-extras.c"
-	}
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[(*length)++] = value;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[*length] = NULL;
-#line 154 "shotwell-publishing-extras.c"
-}
-
-
-static void _vala_array_add16 (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_add14 (SpitPluggable** * array,
+                   int* length,
+                   int* size,
+                   SpitPluggable* value)
+{
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if ((*length) == (*size)) {
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 165 "shotwell-publishing-extras.c"
+#line 107 "shotwell-publishing-extras.c"
 	}
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	(*array)[(*length)++] = value;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	(*array)[*length] = NULL;
-#line 171 "shotwell-publishing-extras.c"
-}
-
-
-static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	if ((*length) == (*size)) {
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 182 "shotwell-publishing-extras.c"
-	}
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[(*length)++] = value;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[*length] = NULL;
-#line 188 "shotwell-publishing-extras.c"
+#line 113 "shotwell-publishing-extras.c"
 }
 
 
-ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file) {
+ShotwellPublishingExtraServices*
+shotwell_publishing_extra_services_construct (GType object_type,
+                                              GFile* module_file)
+{
 	ShotwellPublishingExtraServices * self = NULL;
 	SpitPluggable** _tmp0_;
 	gint _tmp0__length1;
-	YandexService* _tmp1_;
-	SpitPluggable** _tmp2_;
-	gint _tmp2__length1;
-	GFile* _tmp3_;
-	GFile* _tmp4_;
-	GFile* _tmp5_;
-	TumblrService* _tmp6_;
-	SpitPluggable** _tmp7_;
-	gint _tmp7__length1;
-	GFile* _tmp8_;
-	GFile* _tmp9_;
-	GFile* _tmp10_;
-	RajceService* _tmp11_;
-	SpitPluggable** _tmp12_;
-	gint _tmp12__length1;
-	GFile* _tmp13_;
-	GFile* _tmp14_;
-	GFile* _tmp15_;
-	Gallery3Service* _tmp16_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	Gallery3Service* _tmp3_;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = (ShotwellPublishingExtraServices*) g_object_new (object_type, NULL);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp0_ = self->priv->pluggables;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp0__length1 = self->priv->pluggables_length1;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp1_ = yandex_service_new ();
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp2_ = self->priv->pluggables;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp2__length1 = self->priv->pluggables_length1;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp3_ = module_file;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp4_ = g_file_get_parent (_tmp3_);
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp5_ = _tmp4_;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp6_ = tumblr_service_new (_tmp5_);
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add15 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_g_object_unref0 (_tmp5_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp7_ = self->priv->pluggables;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp7__length1 = self->priv->pluggables_length1;
+	_tmp0_ = self->priv->pluggables;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp8_ = module_file;
+	_tmp0__length1 = self->priv->pluggables_length1;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp9_ = g_file_get_parent (_tmp8_);
+	_tmp1_ = g_file_get_parent (module_file);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp10_ = _tmp9_;
+	_tmp2_ = _tmp1_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp11_ = rajce_service_new (_tmp10_);
+	_tmp3_ = gallery3_service_new (_tmp2_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add16 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_g_object_unref0 (_tmp10_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp12_ = self->priv->pluggables;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp12__length1 = self->priv->pluggables_length1;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp13_ = module_file;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp14_ = g_file_get_parent (_tmp13_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp15_ = _tmp14_;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp16_ = gallery3_service_new (_tmp15_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add17 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_g_object_unref0 (_tmp15_);
+	_g_object_unref0 (_tmp2_);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return self;
-#line 277 "shotwell-publishing-extras.c"
+#line 147 "shotwell-publishing-extras.c"
 }
 
 
-ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file) {
+ShotwellPublishingExtraServices*
+shotwell_publishing_extra_services_new (GFile* module_file)
+{
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return shotwell_publishing_extra_services_construct (TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, module_file);
-#line 284 "shotwell-publishing-extras.c"
+#line 156 "shotwell-publishing-extras.c"
 }
 
 
-static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_publishing_extra_services_real_get_module_name (SpitModule* base)
+{
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = _ ("Shotwell Extra Publishing Services");
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 297 "shotwell-publishing-extras.c"
+#line 171 "shotwell-publishing-extras.c"
 }
 
 
-static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_publishing_extra_services_real_get_version (SpitModule* base)
+{
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = _VERSION;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 310 "shotwell-publishing-extras.c"
+#line 186 "shotwell-publishing-extras.c"
 }
 
 
-static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_publishing_extra_services_real_get_id (SpitModule* base)
+{
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = "org.yorba.shotwell.publishing.extras";
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 323 "shotwell-publishing-extras.c"
+#line 201 "shotwell-publishing-extras.c"
 }
 
 
-static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base,
+                                                        int* result_length1)
+{
 	ShotwellPublishingExtraServices * self;
 	SpitPluggable** result = NULL;
 	SpitPluggable** _tmp0_;
 	gint _tmp0__length1;
 	SpitPluggable** _tmp1_;
 	gint _tmp1__length1;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1_ = _tmp0_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if (result_length1) {
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*result_length1 = _tmp1__length1;
-#line 348 "shotwell-publishing-extras.c"
+#line 229 "shotwell-publishing-extras.c"
 	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = _tmp1_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 354 "shotwell-publishing-extras.c"
+#line 235 "shotwell-publishing-extras.c"
 }
 
 
-static void shotwell_publishing_extra_services_class_init (ShotwellPublishingExtraServicesClass * klass) {
+static void
+shotwell_publishing_extra_services_class_init (ShotwellPublishingExtraServicesClass * klass)
+{
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	shotwell_publishing_extra_services_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	g_type_class_add_private (klass, sizeof (ShotwellPublishingExtraServicesPrivate));
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_extra_services_finalize;
-#line 365 "shotwell-publishing-extras.c"
+#line 248 "shotwell-publishing-extras.c"
 }
 
 
-static void shotwell_publishing_extra_services_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_publishing_extra_services_spit_module_interface_init (SpitModuleIface * iface)
+{
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	shotwell_publishing_extra_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -376,11 +261,13 @@ static void shotwell_publishing_extra_services_spit_module_interface_init (SpitM
 	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_id;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_extra_services_real_get_pluggables;
-#line 380 "shotwell-publishing-extras.c"
+#line 265 "shotwell-publishing-extras.c"
 }
 
 
-static void shotwell_publishing_extra_services_instance_init (ShotwellPublishingExtraServices * self) {
+static void
+shotwell_publishing_extra_services_instance_init (ShotwellPublishingExtraServices * self)
+{
 	SpitPluggable** _tmp0_;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self->priv = SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE (self);
@@ -392,11 +279,13 @@ static void shotwell_publishing_extra_services_instance_init (ShotwellPublishing
 	self->priv->pluggables_length1 = 0;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 396 "shotwell-publishing-extras.c"
+#line 283 "shotwell-publishing-extras.c"
 }
 
 
-static void shotwell_publishing_extra_services_finalize (GObject * obj) {
+static void
+shotwell_publishing_extra_services_finalize (GObject * obj)
+{
 	ShotwellPublishingExtraServices * self;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
@@ -404,11 +293,13 @@ static void shotwell_publishing_extra_services_finalize (GObject * obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	G_OBJECT_CLASS (shotwell_publishing_extra_services_parent_class)->finalize (obj);
-#line 408 "shotwell-publishing-extras.c"
+#line 297 "shotwell-publishing-extras.c"
 }
 
 
-GType shotwell_publishing_extra_services_get_type (void) {
+GType
+shotwell_publishing_extra_services_get_type (void)
+{
 	static volatile gsize shotwell_publishing_extra_services_type_id__volatile = 0;
 	if (g_once_init_enter (&shotwell_publishing_extra_services_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingExtraServicesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_extra_services_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingExtraServices), 0, (GInstanceInitFunc) shotwell_publishing_extra_services_instance_init, NULL };
@@ -422,65 +313,56 @@ GType shotwell_publishing_extra_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_;
+	ShotwellPublishingExtraServices* _tmp2_ = NULL;
 	gint _tmp3_;
-	gint _tmp4_;
-	ShotwellPublishingExtraServices* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_;
-	gint _tmp7_;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+	_tmp0_ = (*params).host_min_spit_interface;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+	_tmp1_ = (*params).host_max_spit_interface;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+	(*params).module_spit_interface = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_CURRENT_INTERFACE);
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+	_tmp3_ = (*params).module_spit_interface;
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+	if (_tmp3_ != SPIT_UNSUPPORTED_INTERFACE) {
+#line 335 "shotwell-publishing-extras.c"
+		GFile* _tmp4_;
+		ShotwellPublishingExtraServices* _tmp5_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp0_ = params;
+		_tmp4_ = (*params).module_file;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp1_ = (*_tmp0_).host_min_spit_interface;
+		_tmp5_ = shotwell_publishing_extra_services_new (_tmp4_);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp2_ = params;
+		_g_object_unref0 (_tmp2_);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp3_ = (*_tmp2_).host_max_spit_interface;
+		_tmp2_ = _tmp5_;
+#line 346 "shotwell-publishing-extras.c"
+	} else {
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
+		_g_object_unref0 (_tmp2_);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*params).module_spit_interface = _tmp4_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp6_ = params;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 454 "shotwell-publishing-extras.c"
-		SpitEntryPointParams* _tmp8_;
-		GFile* _tmp9_;
-		ShotwellPublishingExtraServices* _tmp10_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		_tmp8_ = params;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		_tmp9_ = (*_tmp8_).module_file;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		_tmp10_ = shotwell_publishing_extra_services_new (_tmp9_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		_g_object_unref0 (_tmp5_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		_tmp5_ = _tmp10_;
-#line 468 "shotwell-publishing-extras.c"
-	} else {
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		_g_object_unref0 (_tmp5_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		_tmp5_ = NULL;
-#line 474 "shotwell-publishing-extras.c"
+		_tmp2_ = NULL;
+#line 352 "shotwell-publishing-extras.c"
 	}
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_MODULE, SpitModule);
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 480 "shotwell-publishing-extras.c"
+#line 358 "shotwell-publishing-extras.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) {
@@ -492,7 +374,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-extras/shotwell-publishing-extras.vala b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
index 2f47771..fb622fa 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
@@ -14,10 +14,6 @@ private class ShotwellPublishingExtraServices : Object, Spit.Module {
         pluggables += new YandexService();
 #endif
 
-#if HAVE_TUMBLR
-        pluggables += new TumblrService(module_file.get_parent());
-#endif
-
 #if HAVE_RAJCE
         pluggables += new RajceService(module_file.get_parent());
 #endif
diff --git a/plugins/shotwell-publishing-extras/tumblr.png b/plugins/shotwell-publishing-extras/tumblr.png
deleted file mode 100644
index d5bf02b..0000000
--- a/plugins/shotwell-publishing-extras/tumblr.png
+++ /dev/null
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
deleted file mode 100644
index 24a647f..0000000
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
-<interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
-  <object class="GtkWindow" id="authentication_pane">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="content">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">30</property>
-        <property name="margin_right">30</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">8</property>
-        <child>
-          <object class="GtkLabel" id="message_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="label">label</property>
-            <property name="wrap">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="field_table">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">2</property>
-            <property name="column_spacing">8</property>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">_Email address</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">username_entry</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="username_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="invisible_char">●</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="password_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">False</property>
-                <property name="visibility">False</property>
-                <property name="invisible_char">●</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">_Password</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">password_entry</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButtonBox" id="hbuttonbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkButton" id="login_button">
-                <property name="label" translatable="yes">Log in</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
deleted file mode 100644
index acc5459..0000000
--- a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
-<interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
-  <object class="GtkBox" id="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>