Merge branch 'release/0.26.4-1'0.26.4-1

5 files changed, 7583 insertions, 7593 deletions

diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c
index 29ade8e..17f2ef2 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.34.7, the Vala compiler
+/* GalleryConnector.c generated by valac 0.36.6, the Vala compiler
  * generated from GalleryConnector.vala, do not modify */
 
 /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org
@@ -242,6 +242,12 @@ 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;
 #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
+};
+static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingGallery3PublishingParametersPrivate PublishingGallery3PublishingParametersPrivate;
 typedef struct _PublishingGallery3ParamSpecPublishingParameters PublishingGallery3ParamSpecPublishingParameters;
 typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3CredentialsPanePrivate;
@@ -255,7 +261,19 @@ typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3Crede
 
 typedef struct _PublishingGallery3CredentialsGrid PublishingGallery3CredentialsGrid;
 typedef struct _PublishingGallery3CredentialsGridClass PublishingGallery3CredentialsGridClass;
+enum  {
+	PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL,
+	PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL,
+	PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL
+};
+static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingGallery3CredentialsGridPrivate PublishingGallery3CredentialsGridPrivate;
+enum  {
+	PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL,
+	PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL,
+	PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL
+};
+static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL] = {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);
@@ -587,15 +605,15 @@ struct _PublishingGallery3UploaderPrivate {
 
 
 static gpointer shotwell_publishing_gallery3_parent_class = NULL;
-static SpitModuleIface* shotwell_publishing_gallery3_spit_module_parent_iface = NULL;
+static SpitModuleIface * shotwell_publishing_gallery3_spit_module_parent_iface = NULL;
 static gpointer gallery3_service_parent_class = NULL;
 static GdkPixbuf** gallery3_service_icon_pixbuf_set;
 static gint gallery3_service_icon_pixbuf_set_length1;
 static GdkPixbuf** gallery3_service_icon_pixbuf_set = NULL;
 static gint gallery3_service_icon_pixbuf_set_length1 = 0;
 static gint _gallery3_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* gallery3_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* gallery3_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * gallery3_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * gallery3_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_gallery3_album_parent_class = NULL;
 static gpointer publishing_gallery3_base_gallery_transaction_parent_class = NULL;
 static gpointer publishing_gallery3_key_fetch_transaction_parent_class = NULL;
@@ -608,12 +626,12 @@ static gpointer publishing_gallery3_gallery_set_tag_relationship_transaction_par
 static gpointer publishing_gallery3_gallery_album_create_transaction_parent_class = NULL;
 static gpointer publishing_gallery3_gallery_upload_transaction_parent_class = NULL;
 static gpointer publishing_gallery3_gallery_publisher_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = NULL;
 static gpointer publishing_gallery3_publishing_options_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_gallery3_publishing_parameters_parent_class = NULL;
 static gpointer publishing_gallery3_credentials_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_gallery3_credentials_grid_parent_class = NULL;
 static gpointer publishing_gallery3_session_parent_class = NULL;
 static gpointer publishing_gallery3_uploader_parent_class = NULL;
@@ -651,12 +669,12 @@ ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object
 Gallery3Service* gallery3_service_new (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 void shotwell_publishing_gallery3_finalize (GObject* obj);
+static void shotwell_publishing_gallery3_finalize (GObject * obj);
 enum  {
 	GALLERY3_SERVICE_DUMMY_PROPERTY
 };
@@ -672,7 +690,7 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (S
 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);
+static void gallery3_service_finalize (GObject * obj);
 #define PUBLISHING_GALLERY3_SERVICE_NAME "Gallery3"
 #define PUBLISHING_GALLERY3_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into your Gallery.\n" \
 "\n" \
@@ -709,7 +727,7 @@ static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self
 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);
+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
@@ -718,7 +736,7 @@ 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);
-static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction* obj);
+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  {
@@ -727,7 +745,7 @@ enum  {
 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);
+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
@@ -743,7 +761,7 @@ enum  {
 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);
+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  {
@@ -755,13 +773,13 @@ static void publishing_gallery3_get_albums_transaction_set_album_urls (Publishin
 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 _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 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);
+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
@@ -778,7 +796,7 @@ enum  {
 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);
+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
@@ -804,7 +822,7 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_name (Publishin
 const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self);
 gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self);
 PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self);
-static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction* obj);
+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  {
@@ -821,7 +839,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 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_finalize (PublishingRESTSupportTransaction* obj);
+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  {
@@ -908,13 +926,13 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ
 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);
+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);
+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
@@ -950,7 +968,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_op
 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 publishing_gallery3_publishing_options_pane_finalize (GObject* obj);
+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
@@ -961,7 +979,7 @@ static void publishing_gallery3_publishing_parameters_set_album_name (Publishing
 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_finalize (PublishingGallery3PublishingParameters* obj);
+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  {
@@ -980,11 +998,11 @@ static void _publishing_gallery3_credentials_pane_notify_login_publishing_galler
 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 publishing_gallery3_credentials_pane_finalize (GObject* obj);
+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
+	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.")
@@ -1000,7 +1018,7 @@ static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (Publ
 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_finalize (GObject* obj);
+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);
 #define PUBLISHING_GALLERY3_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3SessionPrivate))
@@ -1011,42 +1029,42 @@ static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRES
 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);
+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 void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+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_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 1002 "GalleryConnector.c"
+#line 1020 "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 1008 "GalleryConnector.c"
+#line 1026 "GalleryConnector.c"
 }
 
 
 ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file) {
 	ShotwellPublishingGallery3 * self = NULL;
 	GFile* resource_directory = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	SpitPluggable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	Gallery3Service* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	SpitPluggable** _tmp2_;
+	gint _tmp2__length1;
+	Gallery3Service* _tmp3_;
 #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"
@@ -1069,30 +1087,27 @@ ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object
 	_g_object_unref0 (resource_directory);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 1042 "GalleryConnector.c"
+#line 1060 "GalleryConnector.c"
 }
 
 
 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 1049 "GalleryConnector.c"
+#line 1067 "GalleryConnector.c"
 }
 
 
 static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base) {
 	ShotwellPublishingGallery3 * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3);
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp0_ = _ ("Gallery3 publishing module");
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	result = _tmp0_;
+	result = _ ("Gallery3 publishing module");
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1065 "GalleryConnector.c"
+#line 1080 "GalleryConnector.c"
 }
 
 
@@ -1105,7 +1120,7 @@ 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 1078 "GalleryConnector.c"
+#line 1093 "GalleryConnector.c"
 }
 
 
@@ -1118,17 +1133,17 @@ 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 1091 "GalleryConnector.c"
+#line 1106 "GalleryConnector.c"
 }
 
 
 static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1) {
 	ShotwellPublishingGallery3 * self;
 	SpitPluggable** result = NULL;
-	SpitPluggable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPluggable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitPluggable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPluggable** _tmp1_;
+	gint _tmp1__length1;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1143,13 +1158,13 @@ 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 1116 "GalleryConnector.c"
+#line 1131 "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 1122 "GalleryConnector.c"
+#line 1137 "GalleryConnector.c"
 }
 
 
@@ -1160,7 +1175,7 @@ static void shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3C
 	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 1133 "GalleryConnector.c"
+#line 1148 "GalleryConnector.c"
 }
 
 
@@ -1168,19 +1183,19 @@ static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleI
 #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"
-	iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_module_name;
+	iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_module_name;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_version;
+	iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_version;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_id;
+	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 1148 "GalleryConnector.c"
+	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_gallery3_real_get_pluggables;
+#line 1163 "GalleryConnector.c"
 }
 
 
 static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self) {
-	SpitPluggable** _tmp0_ = NULL;
+	SpitPluggable** _tmp0_;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE (self);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1191,11 +1206,11 @@ 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 1164 "GalleryConnector.c"
+#line 1179 "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);
@@ -1203,7 +1218,7 @@ 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 1176 "GalleryConnector.c"
+#line 1191 "GalleryConnector.c"
 }
 
 
@@ -1223,8 +1238,8 @@ GType shotwell_publishing_gallery3_get_type (void) {
 
 Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory) {
 	Gallery3Service * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1235,9 +1250,9 @@ 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 1208 "GalleryConnector.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 1223 "GalleryConnector.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" GALLERY3_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1248,27 +1263,27 @@ 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 1221 "GalleryConnector.c"
+#line 1236 "GalleryConnector.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 1225 "GalleryConnector.c"
+#line 1240 "GalleryConnector.c"
 }
 
 
 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 1232 "GalleryConnector.c"
+#line 1247 "GalleryConnector.c"
 }
 
 
 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_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 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"
@@ -1281,7 +1296,7 @@ static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1254 "GalleryConnector.c"
+#line 1269 "GalleryConnector.c"
 }
 
 
@@ -1294,7 +1309,7 @@ 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 1267 "GalleryConnector.c"
+#line 1282 "GalleryConnector.c"
 }
 
 
@@ -1307,14 +1322,14 @@ 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 1280 "GalleryConnector.c"
+#line 1295 "GalleryConnector.c"
 }
 
 
 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 1287 "GalleryConnector.c"
+#line 1302 "GalleryConnector.c"
 }
 
 
@@ -1325,32 +1340,32 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 	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 1298 "GalleryConnector.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 1313 "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 1304 "GalleryConnector.c"
+#line 1319 "GalleryConnector.c"
 	}
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1308 "GalleryConnector.c"
+#line 1323 "GalleryConnector.c"
 }
 
 
 static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	Gallery3Service * self;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GdkPixbuf** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GdkPixbuf** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	GdkPixbuf** _tmp6_;
+	gint _tmp6__length1;
+	GdkPixbuf** _tmp7_;
+	gint _tmp7__length1;
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service);
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1407,7 +1422,7 @@ 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 1380 "GalleryConnector.c"
+#line 1395 "GalleryConnector.c"
 }
 
 
@@ -1415,15 +1430,15 @@ static void gallery3_service_real_activation (SpitPluggable* base, gboolean enab
 	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 1388 "GalleryConnector.c"
+#line 1403 "GalleryConnector.c"
 }
 
 
 static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	Gallery3Service * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingGallery3GalleryPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingGallery3GalleryPublisher* _tmp1_;
 #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"
@@ -1436,7 +1451,7 @@ static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 1409 "GalleryConnector.c"
+#line 1424 "GalleryConnector.c"
 }
 
 
@@ -1449,7 +1464,7 @@ 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 1422 "GalleryConnector.c"
+#line 1437 "GalleryConnector.c"
 }
 
 
@@ -1458,7 +1473,7 @@ static void gallery3_service_class_init (Gallery3ServiceClass * klass) {
 	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 1431 "GalleryConnector.c"
+#line 1446 "GalleryConnector.c"
 }
 
 
@@ -1466,16 +1481,16 @@ static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface *
 #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"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) gallery3_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) gallery3_service_real_get_pluggable_interface;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) gallery3_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) gallery3_service_real_get_id;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) gallery3_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) gallery3_service_real_get_pluggable_name;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) gallery3_service_real_get_info;
+	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 1448 "GalleryConnector.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) gallery3_service_real_activation;
+#line 1463 "GalleryConnector.c"
 }
 
 
@@ -1483,10 +1498,10 @@ static void gallery3_service_spit_publishing_service_interface_init (SpitPublish
 #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;
+	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 1459 "GalleryConnector.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) gallery3_service_real_get_supported_media;
+#line 1474 "GalleryConnector.c"
 }
 
 
@@ -1494,13 +1509,13 @@ 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 1473 "GalleryConnector.c"
+#line 1488 "GalleryConnector.c"
 }
 
 
@@ -1523,17 +1538,17 @@ GType gallery3_service_get_type (void) {
 PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection) {
 	PublishingGallery3Album* self = NULL;
 	JsonObject* entity = NULL;
-	JsonObject* _tmp0_ = NULL;
-	JsonObject* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	JsonObject* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	JsonObject* _tmp0_;
+	JsonObject* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	JsonObject* _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #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"
@@ -1578,20 +1593,20 @@ PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type,
 	_g_free0 (_tmp10_);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 1551 "GalleryConnector.c"
+#line 1566 "GalleryConnector.c"
 }
 
 
 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 1558 "GalleryConnector.c"
+#line 1573 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1600,13 +1615,13 @@ 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 1573 "GalleryConnector.c"
+#line 1588 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -1617,13 +1632,13 @@ static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, c
 	_g_free0 (self->priv->_name);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_name = _tmp1_;
-#line 1590 "GalleryConnector.c"
+#line 1605 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1632,13 +1647,13 @@ 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 1605 "GalleryConnector.c"
+#line 1620 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -1649,13 +1664,13 @@ static void publishing_gallery3_album_set_title (PublishingGallery3Album* self,
 	_g_free0 (self->priv->_title);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_title = _tmp1_;
-#line 1622 "GalleryConnector.c"
+#line 1637 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1664,13 +1679,13 @@ 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 1637 "GalleryConnector.c"
+#line 1652 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -1681,13 +1696,13 @@ static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self
 	_g_free0 (self->priv->_summary);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_summary = _tmp1_;
-#line 1654 "GalleryConnector.c"
+#line 1669 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL);
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1696,13 +1711,13 @@ 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 1669 "GalleryConnector.c"
+#line 1684 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -1713,13 +1728,13 @@ static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* s
 	_g_free0 (self->priv->_parentname);
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_parentname = _tmp1_;
-#line 1686 "GalleryConnector.c"
+#line 1701 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL);
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1728,13 +1743,13 @@ 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 1701 "GalleryConnector.c"
+#line 1716 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -1745,13 +1760,13 @@ static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, co
 	_g_free0 (self->priv->_url);
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_url = _tmp1_;
-#line 1718 "GalleryConnector.c"
+#line 1733 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1760,13 +1775,13 @@ 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 1733 "GalleryConnector.c"
+#line 1748 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -1777,13 +1792,13 @@ static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, c
 	_g_free0 (self->priv->_path);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_path = _tmp1_;
-#line 1750 "GalleryConnector.c"
+#line 1765 "GalleryConnector.c"
 }
 
 
 gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), FALSE);
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1792,26 +1807,26 @@ 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 1765 "GalleryConnector.c"
+#line 1780 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #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 1777 "GalleryConnector.c"
+#line 1792 "GalleryConnector.c"
 }
 
 
 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 1784 "GalleryConnector.c"
+#line 1799 "GalleryConnector.c"
 }
 
 
@@ -1820,7 +1835,7 @@ static void publishing_gallery3_value_album_free_value (GValue* value) {
 	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 1793 "GalleryConnector.c"
+#line 1808 "GalleryConnector.c"
 	}
 }
 
@@ -1830,11 +1845,11 @@ static void publishing_gallery3_value_album_copy_value (const GValue* src_value,
 	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 1803 "GalleryConnector.c"
+#line 1818 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1807 "GalleryConnector.c"
+#line 1822 "GalleryConnector.c"
 	}
 }
 
@@ -1842,66 +1857,66 @@ static void publishing_gallery3_value_album_copy_value (const GValue* src_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 1815 "GalleryConnector.c"
+#line 1830 "GalleryConnector.c"
 }
 
 
 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 1822 "GalleryConnector.c"
-		PublishingGallery3Album* object;
+#line 1837 "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 1829 "GalleryConnector.c"
+#line 1844 "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 1833 "GalleryConnector.c"
+#line 1848 "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 1837 "GalleryConnector.c"
+#line 1852 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 1841 "GalleryConnector.c"
+#line 1856 "GalleryConnector.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 1845 "GalleryConnector.c"
+#line 1860 "GalleryConnector.c"
 }
 
 
 static gchar* publishing_gallery3_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingGallery3Album** object_p;
+	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 1856 "GalleryConnector.c"
+#line 1871 "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 1862 "GalleryConnector.c"
+#line 1877 "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 1866 "GalleryConnector.c"
+#line 1881 "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 1870 "GalleryConnector.c"
+#line 1885 "GalleryConnector.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 1874 "GalleryConnector.c"
+#line 1889 "GalleryConnector.c"
 }
 
 
@@ -1915,7 +1930,7 @@ 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 1888 "GalleryConnector.c"
+#line 1903 "GalleryConnector.c"
 }
 
 
@@ -1924,12 +1939,12 @@ gpointer publishing_gallery3_value_get_album (const GValue* value) {
 	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 1897 "GalleryConnector.c"
+#line 1912 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) {
-	PublishingGallery3Album* old;
+	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));
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1944,23 +1959,23 @@ 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 1917 "GalleryConnector.c"
+#line 1932 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 1921 "GalleryConnector.c"
+#line 1936 "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 1927 "GalleryConnector.c"
+#line 1942 "GalleryConnector.c"
 	}
 }
 
 
 void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) {
-	PublishingGallery3Album* old;
+	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));
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1973,17 +1988,17 @@ 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 1946 "GalleryConnector.c"
+#line 1961 "GalleryConnector.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 1950 "GalleryConnector.c"
+#line 1965 "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 1956 "GalleryConnector.c"
+#line 1971 "GalleryConnector.c"
 	}
 }
 
@@ -1995,17 +2010,17 @@ static void publishing_gallery3_album_class_init (PublishingGallery3AlbumClass *
 	((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 1968 "GalleryConnector.c"
+#line 1983 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_album_instance_init (PublishingGallery3Album * self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_ALBUM_GET_PRIVATE (self);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2036,11 +2051,11 @@ 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 2009 "GalleryConnector.c"
+#line 2024 "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);
@@ -2058,7 +2073,7 @@ 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 2031 "GalleryConnector.c"
+#line 2046 "GalleryConnector.c"
 }
 
 
@@ -2077,18 +2092,18 @@ GType publishing_gallery3_album_get_type (void) {
 
 
 gpointer publishing_gallery3_album_ref (gpointer instance) {
-	PublishingGallery3Album* self;
+	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 2056 "GalleryConnector.c"
+#line 2071 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_album_unref (gpointer instance) {
-	PublishingGallery3Album* self;
+	PublishingGallery3Album * self;
 	self = instance;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2096,42 +2111,42 @@ 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 2069 "GalleryConnector.c"
+#line 2084 "GalleryConnector.c"
 	}
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2088 "GalleryConnector.c"
+#line 2103 "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* self = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp12_ = 0;
-	JsonParser* _tmp13_ = NULL;
+	const gchar* _tmp1_;
+	PublishingGallery3Session* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	PublishingRESTSupportHttpMethod _tmp12_;
+	JsonParser* _tmp13_;
 #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"
@@ -2142,32 +2157,32 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans
 	_tmp1_ = item_path;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (g_strcmp0 (_tmp1_, "") != 0) {
-#line 2115 "GalleryConnector.c"
-		const gchar* _tmp2_ = NULL;
-		gchar _tmp3_ = '\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 2124 "GalleryConnector.c"
+#line 2139 "GalleryConnector.c"
 	} else {
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = FALSE;
-#line 2128 "GalleryConnector.c"
+#line 2143 "GalleryConnector.c"
 	}
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp0_) {
-#line 2132 "GalleryConnector.c"
-		const gchar* _tmp4_ = NULL;
+#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 2140 "GalleryConnector.c"
+#line 2155 "GalleryConnector.c"
 	}
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = session;
@@ -2199,14 +2214,14 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans
 	self->parser = _tmp13_;
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 2172 "GalleryConnector.c"
+#line 2187 "GalleryConnector.c"
 }
 
 
 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 2179 "GalleryConnector.c"
+#line 2194 "GalleryConnector.c"
 }
 
 
@@ -2214,12 +2229,12 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 	JsonNode* result = NULL;
 	gchar* json_object = NULL;
 	JsonNode* root_node = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	JsonParser* _tmp15_ = NULL;
-	JsonNode* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
+	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);
@@ -2235,11 +2250,11 @@ 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 2208 "GalleryConnector.c"
+#line 2223 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		const gchar* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = json_object;
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2248,15 +2263,15 @@ 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 2221 "GalleryConnector.c"
+#line 2236 "GalleryConnector.c"
 	}
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp1_) {
-#line 2225 "GalleryConnector.c"
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+#line 2240 "GalleryConnector.c"
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GError* _tmp8_;
+		GError* _tmp9_;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp6_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2277,7 +2292,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 2250 "GalleryConnector.c"
+#line 2265 "GalleryConnector.c"
 		} else {
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_free0 (json_object);
@@ -2287,12 +2302,12 @@ 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 2260 "GalleryConnector.c"
+#line 2275 "GalleryConnector.c"
 		}
 	}
 	{
-		JsonParser* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		JsonParser* _tmp10_;
+		const gchar* _tmp11_;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp10_ = self->parser;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2301,7 +2316,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 2274 "GalleryConnector.c"
+#line 2289 "GalleryConnector.c"
 			goto __catch0_g_error;
 		}
 	}
@@ -2309,9 +2324,9 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 	__catch0_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
+		GError* _tmp12_;
+		const gchar* _tmp13_;
+		GError* _tmp14_;
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		e = _inner_error_;
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2330,7 +2345,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 2303 "GalleryConnector.c"
+#line 2318 "GalleryConnector.c"
 		goto __finally0;
 	}
 	__finally0:
@@ -2344,7 +2359,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 2317 "GalleryConnector.c"
+#line 2332 "GalleryConnector.c"
 		} else {
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_free0 (json_object);
@@ -2354,7 +2369,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 2327 "GalleryConnector.c"
+#line 2342 "GalleryConnector.c"
 		}
 	}
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2367,8 +2382,8 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
 	_tmp17_ = json_node_is_null (root_node);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp17_) {
-#line 2340 "GalleryConnector.c"
-		GError* _tmp18_ = NULL;
+#line 2355 "GalleryConnector.c"
+		GError* _tmp18_;
 #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");
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2381,7 +2396,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 2354 "GalleryConnector.c"
+#line 2369 "GalleryConnector.c"
 		} else {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_free0 (json_object);
@@ -2391,7 +2406,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 2364 "GalleryConnector.c"
+#line 2379 "GalleryConnector.c"
 		}
 	}
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2400,7 +2415,7 @@ 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 2373 "GalleryConnector.c"
+#line 2388 "GalleryConnector.c"
 }
 
 
@@ -2409,7 +2424,7 @@ static void publishing_gallery3_base_gallery_transaction_class_init (PublishingG
 	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 2382 "GalleryConnector.c"
+#line 2397 "GalleryConnector.c"
 }
 
 
@@ -2417,7 +2432,7 @@ static void publishing_gallery3_base_gallery_transaction_instance_init (Publishi
 }
 
 
-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);
@@ -2425,7 +2440,7 @@ 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 2398 "GalleryConnector.c"
+#line 2413 "GalleryConnector.c"
 }
 
 
@@ -2443,10 +2458,10 @@ 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* self = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = 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,156 +2486,156 @@ PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 2444 "GalleryConnector.c"
+#line 2459 "GalleryConnector.c"
 }
 
 
 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 2451 "GalleryConnector.c"
+#line 2466 "GalleryConnector.c"
 }
 
 
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp13_;
+	glong _tmp16_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 2484 "GalleryConnector.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2499 "GalleryConnector.c"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 2493 "GalleryConnector.c"
+#line 2508 "GalleryConnector.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 2499 "GalleryConnector.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2514 "GalleryConnector.c"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 2508 "GalleryConnector.c"
+#line 2523 "GalleryConnector.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 2514 "GalleryConnector.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2529 "GalleryConnector.c"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2523 "GalleryConnector.c"
+#line 2538 "GalleryConnector.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 2527 "GalleryConnector.c"
+#line 2542 "GalleryConnector.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 2535 "GalleryConnector.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2550 "GalleryConnector.c"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2544 "GalleryConnector.c"
+#line 2559 "GalleryConnector.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2548 "GalleryConnector.c"
+#line 2563 "GalleryConnector.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2570 "GalleryConnector.c"
+#line 2585 "GalleryConnector.c"
 }
 
 
 gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp6_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	const gchar* _tmp6_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_KEY_FETCH_TRANSACTION (self), NULL);
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = self->priv->key;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (g_strcmp0 (_tmp0_, "") != 0) {
-#line 2591 "GalleryConnector.c"
-		const gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
+#line 2606 "GalleryConnector.c"
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = self->priv->key;
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2629,7 +2644,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 2602 "GalleryConnector.c"
+#line 2617 "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));
@@ -2643,24 +2658,24 @@ 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 2616 "GalleryConnector.c"
+#line 2631 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp7_ = NULL;
+		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 2623 "GalleryConnector.c"
+#line 2638 "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 2629 "GalleryConnector.c"
+#line 2644 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		const gchar* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp8_ = self->priv->key;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2669,14 +2684,14 @@ 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 2642 "GalleryConnector.c"
+#line 2657 "GalleryConnector.c"
 	}
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp4_) {
-#line 2646 "GalleryConnector.c"
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+#line 2661 "GalleryConnector.c"
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp11_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2691,7 +2706,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 2664 "GalleryConnector.c"
+#line 2679 "GalleryConnector.c"
 	}
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp14_ = self->priv->key;
@@ -2709,7 +2724,7 @@ 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 2682 "GalleryConnector.c"
+#line 2697 "GalleryConnector.c"
 }
 
 
@@ -2720,23 +2735,23 @@ static void publishing_gallery3_key_fetch_transaction_class_init (PublishingGall
 	((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 2693 "GalleryConnector.c"
+#line 2708 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE (self);
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = g_strdup ("");
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->key = _tmp0_;
-#line 2705 "GalleryConnector.c"
+#line 2720 "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);
@@ -2744,7 +2759,7 @@ 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 2717 "GalleryConnector.c"
+#line 2732 "GalleryConnector.c"
 }
 
 
@@ -2762,8 +2777,8 @@ 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* self = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -2776,17 +2791,17 @@ PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request
 	if (!_tmp1_) {
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:254: Not authenticated");
-#line 2749 "GalleryConnector.c"
+#line 2764 "GalleryConnector.c"
 	} else {
-		PublishingGallery3Session* _tmp2_ = NULL;
-		PublishingGallery3Session* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		PublishingRESTSupportHttpMethod _tmp7_ = 0;
-		PublishingGallery3Session* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		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"
@@ -2811,25 +2826,25 @@ PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp10_);
 #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 2784 "GalleryConnector.c"
+#line 2799 "GalleryConnector.c"
 	}
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 2788 "GalleryConnector.c"
+#line 2803 "GalleryConnector.c"
 }
 
 
 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 2795 "GalleryConnector.c"
+#line 2810 "GalleryConnector.c"
 }
 
 
 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 2802 "GalleryConnector.c"
+#line 2817 "GalleryConnector.c"
 }
 
 
@@ -2851,7 +2866,7 @@ GType publishing_gallery3_gallery_request_transaction_get_type (void) {
 
 PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session) {
 	PublishingGallery3GetAlbumURLsTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_ = 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"
@@ -2864,31 +2879,31 @@ PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_t
 	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 2837 "GalleryConnector.c"
+#line 2852 "GalleryConnector.c"
 }
 
 
 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 2844 "GalleryConnector.c"
+#line 2859 "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 2855 "GalleryConnector.c"
+#line 2870 "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 2861 "GalleryConnector.c"
+#line 2876 "GalleryConnector.c"
 }
 
 
@@ -2896,20 +2911,20 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 	gchar** result = NULL;
 	JsonNode* root_node = NULL;
 	JsonArray* all_members = NULL;
-	JsonObject* _tmp2_ = NULL;
-	JsonArray* _tmp3_ = NULL;
+	JsonObject* _tmp2_;
+	JsonArray* _tmp3_;
 	gchar** member_urls = NULL;
-	gint member_urls_length1 = 0;
-	gint _member_urls_size_ = 0;
-	gchar** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
+	gint member_urls_length1;
+	gint _member_urls_size_;
+	gchar** _tmp14_;
+	gint _tmp14__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 2879 "GalleryConnector.c"
+#line 2894 "GalleryConnector.c"
 	{
 		JsonNode* _tmp0_ = NULL;
-		JsonNode* _tmp1_ = NULL;
+		JsonNode* _tmp1_;
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_);
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2918,7 +2933,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 2891 "GalleryConnector.c"
+#line 2906 "GalleryConnector.c"
 				goto __catch1_spit_publishing_publishing_error;
 			}
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2927,11 +2942,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 2900 "GalleryConnector.c"
+#line 2915 "GalleryConnector.c"
 		}
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		root_node = _tmp0_;
-#line 2904 "GalleryConnector.c"
+#line 2919 "GalleryConnector.c"
 	}
 	goto __finally1;
 	__catch1_spit_publishing_publishing_error:
@@ -2945,7 +2960,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 2918 "GalleryConnector.c"
+#line 2933 "GalleryConnector.c"
 	}
 	__finally1:
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2956,7 +2971,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 2929 "GalleryConnector.c"
+#line 2944 "GalleryConnector.c"
 	}
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp2_ = json_node_get_object (root_node);
@@ -2970,37 +2985,37 @@ 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 2943 "GalleryConnector.c"
+#line 2958 "GalleryConnector.c"
 	{
 		guint i = 0U;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = (guint) 0;
-#line 2948 "GalleryConnector.c"
+#line 2963 "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 2955 "GalleryConnector.c"
-				guint _tmp6_ = 0U;
-				JsonArray* _tmp7_ = NULL;
-				guint _tmp8_ = 0U;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				JsonArray* _tmp10_ = NULL;
-				guint _tmp11_ = 0U;
-				const gchar* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
+#line 2970 "GalleryConnector.c"
+				guint _tmp6_;
+				JsonArray* _tmp7_;
+				guint _tmp8_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				JsonArray* _tmp10_;
+				guint _tmp11_;
+				const gchar* _tmp12_;
+				gchar* _tmp13_;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp4_) {
-#line 2967 "GalleryConnector.c"
-					guint _tmp5_ = 0U;
+#line 2982 "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 2973 "GalleryConnector.c"
+#line 2988 "GalleryConnector.c"
 				}
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp4_ = FALSE;
@@ -3014,7 +3029,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 				if (!(_tmp6_ <= (_tmp8_ - 1))) {
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					break;
-#line 2987 "GalleryConnector.c"
+#line 3002 "GalleryConnector.c"
 				}
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp9_ = member_urls;
@@ -3030,7 +3045,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 				_tmp13_ = g_strdup (_tmp12_);
 #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 3003 "GalleryConnector.c"
+#line 3018 "GalleryConnector.c"
 			}
 		}
 	}
@@ -3042,20 +3057,20 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
 	if (result_length1) {
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*result_length1 = _tmp14__length1;
-#line 3015 "GalleryConnector.c"
+#line 3030 "GalleryConnector.c"
 	}
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = _tmp14_;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 3021 "GalleryConnector.c"
+#line 3036 "GalleryConnector.c"
 }
 
 
 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 3028 "GalleryConnector.c"
+#line 3043 "GalleryConnector.c"
 }
 
 
@@ -3075,458 +3090,458 @@ 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 3055 "GalleryConnector.c"
+#line 3070 "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 3061 "GalleryConnector.c"
+#line 3076 "GalleryConnector.c"
 }
 
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
-#line 3078 "GalleryConnector.c"
+#line 3093 "GalleryConnector.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 3088 "GalleryConnector.c"
+#line 3103 "GalleryConnector.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 3098 "GalleryConnector.c"
+#line 3113 "GalleryConnector.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 3104 "GalleryConnector.c"
+#line 3119 "GalleryConnector.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 3115 "GalleryConnector.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 3127 "GalleryConnector.c"
+#line 3142 "GalleryConnector.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 3131 "GalleryConnector.c"
+#line 3146 "GalleryConnector.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 3135 "GalleryConnector.c"
+#line 3150 "GalleryConnector.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 3139 "GalleryConnector.c"
+#line 3154 "GalleryConnector.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		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 3162 "GalleryConnector.c"
+#line 3177 "GalleryConnector.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3171 "GalleryConnector.c"
+#line 3186 "GalleryConnector.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				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 3184 "GalleryConnector.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3199 "GalleryConnector.c"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 3190 "GalleryConnector.c"
+#line 3205 "GalleryConnector.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 3200 "GalleryConnector.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3212 "GalleryConnector.c"
+#line 3227 "GalleryConnector.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 3216 "GalleryConnector.c"
+#line 3231 "GalleryConnector.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 3222 "GalleryConnector.c"
+#line 3237 "GalleryConnector.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 3233 "GalleryConnector.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 3248 "GalleryConnector.c"
+#line 3263 "GalleryConnector.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 3252 "GalleryConnector.c"
+#line 3267 "GalleryConnector.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 3256 "GalleryConnector.c"
+#line 3271 "GalleryConnector.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 3262 "GalleryConnector.c"
+#line 3277 "GalleryConnector.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 3274 "GalleryConnector.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 3295 "GalleryConnector.c"
+#line 3310 "GalleryConnector.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 3299 "GalleryConnector.c"
+#line 3314 "GalleryConnector.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 3305 "GalleryConnector.c"
+#line 3320 "GalleryConnector.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 3312 "GalleryConnector.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3327 "GalleryConnector.c"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
-#line 3320 "GalleryConnector.c"
+#line 3335 "GalleryConnector.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 3358 "GalleryConnector.c"
+#line 3373 "GalleryConnector.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3367 "GalleryConnector.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+#line 3382 "GalleryConnector.c"
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				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 3383 "GalleryConnector.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3398 "GalleryConnector.c"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 3389 "GalleryConnector.c"
+#line 3404 "GalleryConnector.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 3403 "GalleryConnector.c"
+#line 3418 "GalleryConnector.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 3423 "GalleryConnector.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 3438 "GalleryConnector.c"
+#line 3453 "GalleryConnector.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 3442 "GalleryConnector.c"
+#line 3457 "GalleryConnector.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 3450 "GalleryConnector.c"
+#line 3465 "GalleryConnector.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3461 "GalleryConnector.c"
+#line 3476 "GalleryConnector.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3470 "GalleryConnector.c"
+#line 3485 "GalleryConnector.c"
 	}
 }
 
 
 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_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	PublishingGallery3Session* _tmp0_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 	gchar* url_list = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp2_;
 	gchar** my_album_urls = NULL;
-	gint my_album_urls_length1 = 0;
-	gint _my_album_urls_size_ = 0;
+	gint my_album_urls_length1;
+	gint _my_album_urls_size_;
 	gchar* endpoint_url = NULL;
-	PublishingGallery3Session* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	PublishingGallery3Session* _tmp3_;
+	gchar* _tmp4_;
 	gint _tmp5_ = 0;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp6_;
 	gint url_length = 0;
-	gint _tmp10_ = 0;
-	guint _tmp11_ = 0U;
-	gchar** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gchar** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	const gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
+	gint _tmp10_;
+	guint _tmp11_;
+	gchar** _tmp12_;
+	gint _tmp12__length1;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
+	const gchar* _tmp51_;
+	gchar* _tmp52_;
+	const gchar* _tmp53_;
 #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"
@@ -3561,10 +3576,10 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 	_tmp6_ = endpoint_url;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (NULL != _tmp6_) {
-#line 3534 "GalleryConnector.c"
-		const gchar* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+#line 3549 "GalleryConnector.c"
+		const gchar* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp7_ = endpoint_url;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3573,11 +3588,11 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 		_tmp9_ = _tmp8_;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = _tmp9_;
-#line 3546 "GalleryConnector.c"
+#line 3561 "GalleryConnector.c"
 	} else {
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = 0;
-#line 3550 "GalleryConnector.c"
+#line 3565 "GalleryConnector.c"
 	}
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	url_length = _tmp5_;
@@ -3595,61 +3610,61 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 	_tmp13__length1 = _tmp12__length1;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp11_ <= ((guint) (_tmp13__length1 - 1))) {
-#line 3568 "GalleryConnector.c"
-		guint _tmp14_ = 0U;
-		const gchar* _tmp43_ = NULL;
-		gchar** _tmp44_ = NULL;
-		gint _tmp44__length1 = 0;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		gchar* _tmp47_ = NULL;
-		guint _tmp48_ = 0U;
-		gchar** _tmp49_ = NULL;
-		gint _tmp49__length1 = 0;
-		gchar** _tmp50_ = NULL;
-		gint _tmp50__length1 = 0;
+#line 3583 "GalleryConnector.c"
+		guint _tmp14_;
+		const gchar* _tmp43_;
+		gchar** _tmp44_;
+		gint _tmp44__length1;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		gchar* _tmp47_;
+		guint _tmp48_;
+		gchar** _tmp49_;
+		gint _tmp49__length1;
+		gchar** _tmp50_;
+		gint _tmp50__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 3585 "GalleryConnector.c"
+#line 3600 "GalleryConnector.c"
 		{
 			gboolean _tmp15_ = FALSE;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp15_ = TRUE;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			while (TRUE) {
-#line 3592 "GalleryConnector.c"
-				gchar** _tmp27_ = NULL;
-				gint _tmp27__length1 = 0;
-				gchar** _tmp28_ = NULL;
-				gint _tmp28__length1 = 0;
-				gchar** _tmp29_ = NULL;
-				gint _tmp29__length1 = 0;
-				guint _tmp30_ = 0U;
-				const gchar* _tmp31_ = NULL;
-				gchar* _tmp32_ = NULL;
-				gchar* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				gint _tmp35_ = 0;
-				gchar** _tmp36_ = NULL;
-				gint _tmp36__length1 = 0;
-				gchar** _tmp37_ = NULL;
-				gint _tmp37__length1 = 0;
-				guint _tmp38_ = 0U;
-				const gchar* _tmp39_ = NULL;
-				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
-				guint _tmp42_ = 0U;
+#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_;
+				gint _tmp35_;
+				gchar** _tmp36_;
+				gint _tmp36__length1;
+				gchar** _tmp37_;
+				gint _tmp37__length1;
+				guint _tmp38_;
+				const gchar* _tmp39_;
+				gint _tmp40_;
+				gint _tmp41_;
+				guint _tmp42_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp15_) {
-#line 3616 "GalleryConnector.c"
+#line 3631 "GalleryConnector.c"
 					gboolean _tmp16_ = FALSE;
-					guint _tmp17_ = 0U;
-					gchar** _tmp18_ = NULL;
-					gint _tmp18__length1 = 0;
-					gchar** _tmp19_ = NULL;
-					gint _tmp19__length1 = 0;
+					guint _tmp17_;
+					gchar** _tmp18_;
+					gint _tmp18__length1;
+					gchar** _tmp19_;
+					gint _tmp19__length1;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp17_ = self->priv->_urls_sent;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3660,16 +3675,16 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 					_tmp19__length1 = _tmp18__length1;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					if (_tmp17_ <= ((guint) (_tmp19__length1 - 1))) {
-#line 3633 "GalleryConnector.c"
-						gint _tmp20_ = 0;
-						gchar** _tmp21_ = NULL;
-						gint _tmp21__length1 = 0;
-						gchar** _tmp22_ = NULL;
-						gint _tmp22__length1 = 0;
-						guint _tmp23_ = 0U;
-						const gchar* _tmp24_ = NULL;
-						gint _tmp25_ = 0;
-						gint _tmp26_ = 0;
+#line 3648 "GalleryConnector.c"
+						gint _tmp20_;
+						gchar** _tmp21_;
+						gint _tmp21__length1;
+						gchar** _tmp22_;
+						gint _tmp22__length1;
+						guint _tmp23_;
+						const gchar* _tmp24_;
+						gint _tmp25_;
+						gint _tmp26_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp20_ = url_length;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3688,17 +3703,17 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 						_tmp26_ = _tmp25_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp16_ = ((_tmp20_ + _tmp26_) + 3) <= 255;
-#line 3661 "GalleryConnector.c"
+#line 3676 "GalleryConnector.c"
 					} else {
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp16_ = FALSE;
-#line 3665 "GalleryConnector.c"
+#line 3680 "GalleryConnector.c"
 					}
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					if (!_tmp16_) {
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						break;
-#line 3671 "GalleryConnector.c"
+#line 3686 "GalleryConnector.c"
 					}
 				}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3749,7 +3764,7 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 				_tmp42_ = 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 3722 "GalleryConnector.c"
+#line 3737 "GalleryConnector.c"
 			}
 		}
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3780,7 +3795,7 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
 		_tmp50__length1 = _tmp49__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 3753 "GalleryConnector.c"
+#line 3768 "GalleryConnector.c"
 	}
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp51_ = url_list;
@@ -3802,65 +3817,65 @@ 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 3775 "GalleryConnector.c"
+#line 3790 "GalleryConnector.c"
 }
 
 
 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 3782 "GalleryConnector.c"
+#line 3797 "GalleryConnector.c"
 }
 
 
 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 3789 "GalleryConnector.c"
+#line 3804 "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 3800 "GalleryConnector.c"
+#line 3815 "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 3806 "GalleryConnector.c"
+#line 3821 "GalleryConnector.c"
 }
 
 
 static const gchar* string_to_string (const gchar* self) {
 	const gchar* result = NULL;
-#line 1412 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = self;
-#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3818 "GalleryConnector.c"
+#line 3833 "GalleryConnector.c"
 }
 
 
 PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error) {
 	PublishingGallery3Album** result = NULL;
 	PublishingGallery3Album** albums = NULL;
-	gint albums_length1 = 0;
-	gint _albums_size_ = 0;
+	gint albums_length1;
+	gint _albums_size_;
 	PublishingGallery3Album* tmp_album = NULL;
 	JsonNode* root_node = NULL;
-	JsonNode* _tmp0_ = NULL;
+	JsonNode* _tmp0_;
 	JsonArray* members = NULL;
-	JsonArray* _tmp1_ = NULL;
-	PublishingGallery3Album** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
+	JsonArray* _tmp1_;
+	PublishingGallery3Album** _tmp23_;
+	gint _tmp23__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);
@@ -3886,7 +3901,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 3859 "GalleryConnector.c"
+#line 3874 "GalleryConnector.c"
 		} else {
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_publishing_gallery3_album_unref0 (tmp_album);
@@ -3898,45 +3913,45 @@ 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 3871 "GalleryConnector.c"
+#line 3886 "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 3878 "GalleryConnector.c"
+#line 3893 "GalleryConnector.c"
 	{
 		guint i = 0U;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = (guint) 0;
-#line 3883 "GalleryConnector.c"
+#line 3898 "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 3890 "GalleryConnector.c"
-				guint _tmp4_ = 0U;
-				JsonArray* _tmp5_ = NULL;
-				guint _tmp6_ = 0U;
-				JsonArray* _tmp7_ = NULL;
-				guint _tmp8_ = 0U;
-				JsonObject* _tmp9_ = NULL;
-				PublishingGallery3Album* _tmp10_ = NULL;
-				PublishingGallery3Album* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
-				gboolean _tmp13_ = FALSE;
+#line 3905 "GalleryConnector.c"
+				guint _tmp4_;
+				JsonArray* _tmp5_;
+				guint _tmp6_;
+				JsonArray* _tmp7_;
+				guint _tmp8_;
+				JsonObject* _tmp9_;
+				PublishingGallery3Album* _tmp10_;
+				PublishingGallery3Album* _tmp11_;
+				gboolean _tmp12_;
+				gboolean _tmp13_;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp2_) {
-#line 3903 "GalleryConnector.c"
-					guint _tmp3_ = 0U;
+#line 3918 "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 3909 "GalleryConnector.c"
+#line 3924 "GalleryConnector.c"
 				}
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp2_ = FALSE;
@@ -3950,7 +3965,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 				if (!(_tmp4_ <= (_tmp6_ - 1))) {
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					break;
-#line 3923 "GalleryConnector.c"
+#line 3938 "GalleryConnector.c"
 				}
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp7_ = members;
@@ -3972,11 +3987,11 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 				_tmp13_ = _tmp12_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (_tmp13_) {
-#line 3945 "GalleryConnector.c"
-					PublishingGallery3Album** _tmp14_ = NULL;
-					gint _tmp14__length1 = 0;
-					PublishingGallery3Album* _tmp15_ = NULL;
-					PublishingGallery3Album* _tmp16_ = NULL;
+#line 3960 "GalleryConnector.c"
+					PublishingGallery3Album** _tmp14_;
+					gint _tmp14__length1;
+					PublishingGallery3Album* _tmp15_;
+					PublishingGallery3Album* _tmp16_;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp14_ = albums;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3987,14 +4002,14 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 					_tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp16_);
-#line 3960 "GalleryConnector.c"
+#line 3975 "GalleryConnector.c"
 				} else {
-					PublishingGallery3Album* _tmp17_ = NULL;
-					const gchar* _tmp18_ = NULL;
-					const gchar* _tmp19_ = NULL;
-					const gchar* _tmp20_ = NULL;
-					gchar* _tmp21_ = NULL;
-					gchar* _tmp22_ = NULL;
+					PublishingGallery3Album* _tmp17_;
+					const gchar* _tmp18_;
+					const gchar* _tmp19_;
+					const gchar* _tmp20_;
+					gchar* _tmp21_;
+					gchar* _tmp22_;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp17_ = tmp_album;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4011,7 +4026,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 					g_warning ("GalleryConnector.vala:373: %s", _tmp22_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_g_free0 (_tmp22_);
-#line 3984 "GalleryConnector.c"
+#line 3999 "GalleryConnector.c"
 				}
 			}
 		}
@@ -4024,7 +4039,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 	if (result_length1) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		*result_length1 = _tmp23__length1;
-#line 3997 "GalleryConnector.c"
+#line 4012 "GalleryConnector.c"
 	}
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	result = _tmp23_;
@@ -4032,16 +4047,16 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
 	_publishing_gallery3_album_unref0 (tmp_album);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4005 "GalleryConnector.c"
+#line 4020 "GalleryConnector.c"
 }
 
 
 gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1) {
 	gchar** result;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), NULL);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4056,13 +4071,13 @@ 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 4029 "GalleryConnector.c"
+#line 4044 "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 4035 "GalleryConnector.c"
+#line 4050 "GalleryConnector.c"
 }
 
 
@@ -4073,25 +4088,25 @@ static gchar** _vala_array_dup2 (gchar** self, int length) {
 	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 4046 "GalleryConnector.c"
-		gchar* _tmp0_ = NULL;
+#line 4061 "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 4052 "GalleryConnector.c"
+#line 4067 "GalleryConnector.c"
 	}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 4056 "GalleryConnector.c"
+#line 4071 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1) {
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	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"
@@ -4110,13 +4125,13 @@ static void publishing_gallery3_get_albums_transaction_set_album_urls (Publishin
 	self->priv->_album_urls_length1 = _tmp1__length1;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->__album_urls_size_ = self->priv->_album_urls_length1;
-#line 4083 "GalleryConnector.c"
+#line 4098 "GalleryConnector.c"
 }
 
 
 guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self) {
 	guint result;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), 0U);
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4125,25 +4140,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 4098 "GalleryConnector.c"
+#line 4113 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value) {
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #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 4110 "GalleryConnector.c"
+#line 4125 "GalleryConnector.c"
 }
 
 
 gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), FALSE);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4152,19 +4167,19 @@ 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 4125 "GalleryConnector.c"
+#line 4140 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #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 4137 "GalleryConnector.c"
+#line 4152 "GalleryConnector.c"
 }
 
 
@@ -4175,7 +4190,7 @@ static void publishing_gallery3_get_albums_transaction_class_init (PublishingGal
 	((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 4148 "GalleryConnector.c"
+#line 4163 "GalleryConnector.c"
 }
 
 
@@ -4192,11 +4207,11 @@ 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 4165 "GalleryConnector.c"
+#line 4180 "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);
@@ -4204,7 +4219,7 @@ 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 4177 "GalleryConnector.c"
+#line 4192 "GalleryConnector.c"
 }
 
 
@@ -4223,14 +4238,14 @@ GType publishing_gallery3_get_albums_transaction_get_type (void) {
 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 4196 "GalleryConnector.c"
+#line 4211 "GalleryConnector.c"
 }
 
 
 PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name) {
 	PublishingGallery3GalleryGetTagTransaction* self = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -4243,26 +4258,26 @@ PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_
 	if (!_tmp1_) {
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:389: Not authenticated");
-#line 4216 "GalleryConnector.c"
+#line 4231 "GalleryConnector.c"
 	} else {
 		JsonGenerator* entity = NULL;
-		JsonGenerator* _tmp2_ = NULL;
+		JsonGenerator* _tmp2_;
 		JsonNode* root_node = NULL;
-		JsonNode* _tmp3_ = NULL;
+		JsonNode* _tmp3_;
 		JsonObject* obj = NULL;
-		JsonObject* _tmp4_ = NULL;
-		PublishingGallery3Session* _tmp5_ = NULL;
-		PublishingGallery3Session* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		PublishingGallery3Session* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		JsonObject* _tmp4_;
+		PublishingGallery3Session* _tmp5_;
+		PublishingGallery3Session* _tmp6_;
+		const gchar* _tmp7_;
+		const gchar* _tmp8_;
+		PublishingGallery3Session* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		const gchar* _tmp12_;
 		gsize entity_length = 0UL;
 		gchar* entity_value = NULL;
 		gsize _tmp13_ = 0UL;
-		gchar* _tmp14_ = NULL;
+		gchar* _tmp14_;
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp2_ = json_generator_new ();
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4321,18 +4336,18 @@ 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 4294 "GalleryConnector.c"
+#line 4309 "GalleryConnector.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4298 "GalleryConnector.c"
+#line 4313 "GalleryConnector.c"
 }
 
 
 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 4305 "GalleryConnector.c"
+#line 4320 "GalleryConnector.c"
 }
 
 
@@ -4340,16 +4355,16 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
 	gchar* result = NULL;
 	JsonNode* root_node = NULL;
 	gchar* url = NULL;
-	JsonObject* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	JsonObject* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	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 4319 "GalleryConnector.c"
+#line 4334 "GalleryConnector.c"
 	{
 		JsonNode* _tmp0_ = NULL;
-		JsonNode* _tmp1_ = NULL;
+		JsonNode* _tmp1_;
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_);
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4358,7 +4373,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 4331 "GalleryConnector.c"
+#line 4346 "GalleryConnector.c"
 				goto __catch2_spit_publishing_publishing_error;
 			}
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4369,11 +4384,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 4342 "GalleryConnector.c"
+#line 4357 "GalleryConnector.c"
 		}
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		root_node = _tmp0_;
-#line 4346 "GalleryConnector.c"
+#line 4361 "GalleryConnector.c"
 	}
 	goto __finally2;
 	__catch2_spit_publishing_publishing_error:
@@ -4387,7 +4402,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 4360 "GalleryConnector.c"
+#line 4375 "GalleryConnector.c"
 	}
 	__finally2:
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4400,7 +4415,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 4373 "GalleryConnector.c"
+#line 4388 "GalleryConnector.c"
 	}
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp2_ = json_node_get_object (root_node);
@@ -4416,14 +4431,14 @@ 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 4389 "GalleryConnector.c"
+#line 4404 "GalleryConnector.c"
 }
 
 
 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 4396 "GalleryConnector.c"
+#line 4411 "GalleryConnector.c"
 }
 
 
@@ -4445,8 +4460,8 @@ 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* self = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	const gchar* _tmp1_ = 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"
@@ -4459,14 +4474,14 @@ PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery
 	self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4432 "GalleryConnector.c"
+#line 4447 "GalleryConnector.c"
 }
 
 
 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 4439 "GalleryConnector.c"
+#line 4454 "GalleryConnector.c"
 }
 
 
@@ -4475,9 +4490,9 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
 	JsonNode* root_node = NULL;
 	JsonObject* relationships = NULL;
 	JsonObject* tags = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION (self), NULL);
@@ -4485,20 +4500,20 @@ 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 4458 "GalleryConnector.c"
-		JsonNode* _tmp3_ = NULL;
-		JsonObject* _tmp4_ = NULL;
-		JsonObject* _tmp5_ = NULL;
-		JsonObject* _tmp6_ = NULL;
-		JsonObject* _tmp7_ = NULL;
-		JsonObject* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
+#line 4473 "GalleryConnector.c"
+		JsonNode* _tmp3_;
+		JsonObject* _tmp4_;
+		JsonObject* _tmp5_;
+		JsonObject* _tmp6_;
+		JsonObject* _tmp7_;
+		JsonObject* _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
 		{
 			JsonNode* _tmp1_ = NULL;
-			JsonNode* _tmp2_ = NULL;
+			JsonNode* _tmp2_;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp2_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4507,7 +4522,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 4480 "GalleryConnector.c"
+#line 4495 "GalleryConnector.c"
 					goto __catch3_spit_publishing_publishing_error;
 				}
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4516,11 +4531,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 4489 "GalleryConnector.c"
+#line 4504 "GalleryConnector.c"
 			}
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			root_node = _tmp1_;
-#line 4493 "GalleryConnector.c"
+#line 4508 "GalleryConnector.c"
 		}
 		goto __finally3;
 		__catch3_spit_publishing_publishing_error:
@@ -4534,7 +4549,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 4507 "GalleryConnector.c"
+#line 4522 "GalleryConnector.c"
 		}
 		__finally3:
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4545,7 +4560,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 4518 "GalleryConnector.c"
+#line 4533 "GalleryConnector.c"
 		}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = root_node;
@@ -4579,7 +4594,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 4552 "GalleryConnector.c"
+#line 4567 "GalleryConnector.c"
 	}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp13_ = self->priv->item_tags_path;
@@ -4589,7 +4604,7 @@ 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 4562 "GalleryConnector.c"
+#line 4577 "GalleryConnector.c"
 }
 
 
@@ -4600,23 +4615,23 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_in
 	((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 4573 "GalleryConnector.c"
+#line 4588 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self) {
-	gchar* _tmp0_ = NULL;
+	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);
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp0_ = g_strdup ("");
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->item_tags_path = _tmp0_;
-#line 4585 "GalleryConnector.c"
+#line 4600 "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);
@@ -4624,7 +4639,7 @@ 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 4597 "GalleryConnector.c"
+#line 4612 "GalleryConnector.c"
 }
 
 
@@ -4642,8 +4657,8 @@ 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* self = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -4660,28 +4675,28 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall
 	if (!_tmp1_) {
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:489: Not authenticated");
-#line 4633 "GalleryConnector.c"
+#line 4648 "GalleryConnector.c"
 	} else {
 		JsonGenerator* entity = NULL;
-		JsonGenerator* _tmp2_ = NULL;
+		JsonGenerator* _tmp2_;
 		JsonNode* root_node = NULL;
-		JsonNode* _tmp3_ = NULL;
+		JsonNode* _tmp3_;
 		JsonObject* obj = NULL;
-		JsonObject* _tmp4_ = NULL;
-		PublishingGallery3Session* _tmp5_ = NULL;
-		PublishingGallery3Session* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		PublishingGallery3Session* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = 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_;
 		gsize entity_length = 0UL;
 		gchar* entity_value = NULL;
 		gsize _tmp15_ = 0UL;
-		gchar* _tmp16_ = NULL;
+		gchar* _tmp16_;
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp2_ = json_generator_new ();
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4746,25 +4761,25 @@ 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 4719 "GalleryConnector.c"
+#line 4734 "GalleryConnector.c"
 	}
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4723 "GalleryConnector.c"
+#line 4738 "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) {
 #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 4730 "GalleryConnector.c"
+#line 4745 "GalleryConnector.c"
 }
 
 
 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 4737 "GalleryConnector.c"
+#line 4752 "GalleryConnector.c"
 }
 
 
@@ -4786,8 +4801,8 @@ 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* self = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -4800,34 +4815,34 @@ PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_alb
 	if (!_tmp1_) {
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:533: Not authenticated");
-#line 4773 "GalleryConnector.c"
+#line 4788 "GalleryConnector.c"
 	} else {
 		JsonGenerator* entity = NULL;
-		JsonGenerator* _tmp2_ = NULL;
+		JsonGenerator* _tmp2_;
 		JsonNode* root_node = NULL;
-		JsonNode* _tmp3_ = NULL;
+		JsonNode* _tmp3_;
 		JsonObject* obj = NULL;
-		JsonObject* _tmp4_ = NULL;
-		PublishingGallery3Session* _tmp5_ = NULL;
-		PublishingGallery3Session* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		PublishingGallery3Session* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		PublishingGallery3Session* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		PublishingGallery3PublishingParameters* _tmp16_ = NULL;
-		PublishingGallery3PublishingParameters* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		PublishingGallery3PublishingParameters* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
+		JsonObject* _tmp4_;
+		PublishingGallery3Session* _tmp5_;
+		PublishingGallery3Session* _tmp6_;
+		const gchar* _tmp7_;
+		const gchar* _tmp8_;
+		PublishingGallery3Session* _tmp9_;
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		PublishingGallery3Session* _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_ = NULL;
+		gchar* _tmp23_;
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp2_ = json_generator_new ();
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4914,18 +4929,18 @@ 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 4887 "GalleryConnector.c"
+#line 4902 "GalleryConnector.c"
 	}
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 4891 "GalleryConnector.c"
+#line 4906 "GalleryConnector.c"
 }
 
 
 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 4898 "GalleryConnector.c"
+#line 4913 "GalleryConnector.c"
 }
 
 
@@ -4933,18 +4948,18 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
 	gchar* result = NULL;
 	JsonNode* root_node = NULL;
 	gchar* new_path = NULL;
-	JsonObject* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	JsonObject* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	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 4914 "GalleryConnector.c"
+#line 4929 "GalleryConnector.c"
 	{
 		JsonNode* _tmp0_ = NULL;
-		JsonNode* _tmp1_ = NULL;
+		JsonNode* _tmp1_;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_);
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4953,7 +4968,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 4926 "GalleryConnector.c"
+#line 4941 "GalleryConnector.c"
 				goto __catch4_spit_publishing_publishing_error;
 			}
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4964,11 +4979,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 4937 "GalleryConnector.c"
+#line 4952 "GalleryConnector.c"
 		}
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		root_node = _tmp0_;
-#line 4941 "GalleryConnector.c"
+#line 4956 "GalleryConnector.c"
 	}
 	goto __finally4;
 	__catch4_spit_publishing_publishing_error:
@@ -4982,7 +4997,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 4955 "GalleryConnector.c"
+#line 4970 "GalleryConnector.c"
 	}
 	__finally4:
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4995,7 +5010,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 4968 "GalleryConnector.c"
+#line 4983 "GalleryConnector.c"
 	}
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp2_ = json_node_get_object (root_node);
@@ -5019,13 +5034,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 4992 "GalleryConnector.c"
+#line 5007 "GalleryConnector.c"
 }
 
 
 PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self) {
 	PublishingGallery3PublishingParameters* result;
-	PublishingGallery3PublishingParameters* _tmp0_ = NULL;
+	PublishingGallery3PublishingParameters* _tmp0_;
 #line 522 "/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 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5034,20 +5049,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create
 	result = _tmp0_;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 5007 "GalleryConnector.c"
+#line 5022 "GalleryConnector.c"
 }
 
 
 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 5014 "GalleryConnector.c"
+#line 5029 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value) {
-	PublishingGallery3PublishingParameters* _tmp0_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp1_ = NULL;
+	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"
@@ -5058,7 +5073,7 @@ static void publishing_gallery3_gallery_album_create_transaction_set_parameters
 	_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 5031 "GalleryConnector.c"
+#line 5046 "GalleryConnector.c"
 }
 
 
@@ -5069,18 +5084,18 @@ static void publishing_gallery3_gallery_album_create_transaction_class_init (Pub
 	((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 5042 "GalleryConnector.c"
+#line 5057 "GalleryConnector.c"
 }
 
 
 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 5049 "GalleryConnector.c"
+#line 5064 "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);
@@ -5090,7 +5105,7 @@ 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 5063 "GalleryConnector.c"
+#line 5078 "GalleryConnector.c"
 }
 
 
@@ -5109,83 +5124,83 @@ GType publishing_gallery3_gallery_album_create_transaction_get_type (void) {
 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 5082 "GalleryConnector.c"
+#line 5097 "GalleryConnector.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	var = (g_free (var), NULL);
-#line 5089 "GalleryConnector.c"
+#line 5104 "GalleryConnector.c"
 }
 
 
 PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingGallery3GalleryUploadTransaction* self = NULL;
-	PublishingGallery3PublishingParameters* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar _tmp3_ = '\0';
-	PublishingGallery3Session* _tmp7_ = NULL;
-	SpitPublishingPublishable* _tmp8_ = NULL;
-	PublishingGallery3Session* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp19_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp20_ = NULL;
-	PublishingGallery3Session* _tmp21_ = NULL;
-	PublishingGallery3Session* _tmp22_ = NULL;
-	PublishingGallery3Session* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
+	PublishingGallery3PublishingParameters* _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* _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_ = NULL;
-	GEqualFunc _tmp27_ = NULL;
-	GHashTable* _tmp28_ = NULL;
+	GHashFunc _tmp26_;
+	GEqualFunc _tmp27_;
+	GHashTable* _tmp28_;
 	gchar* title = NULL;
-	SpitPublishingPublishable* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
+	SpitPublishingPublishable* _tmp29_;
+	gchar* _tmp30_;
 	gchar* filename = NULL;
-	SpitPublishingPublishable* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
+	SpitPublishingPublishable* _tmp31_;
+	gchar* _tmp32_;
 	gboolean _tmp33_ = FALSE;
-	const gchar* _tmp34_ = NULL;
-	GHashTable* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	const gchar* _tmp40_ = NULL;
-	const gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	GHashTable* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	GHashTable* _tmp46_ = NULL;
-	JsonGenerator* _tmp47_ = NULL;
+	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* desc = NULL;
-	SpitPublishingPublishable* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
+	SpitPublishingPublishable* _tmp48_;
+	gchar* _tmp49_;
 	const gchar* _tmp50_ = NULL;
-	SpitPublishingPublishable* _tmp51_ = NULL;
-	SpitPublishingPublisherMediaType _tmp52_ = 0;
+	SpitPublishingPublishable* _tmp51_;
+	SpitPublishingPublisherMediaType _tmp52_;
 	gchar* type = NULL;
-	gchar* _tmp53_ = NULL;
+	gchar* _tmp53_;
 	JsonNode* root_node = NULL;
-	JsonNode* _tmp54_ = NULL;
+	JsonNode* _tmp54_;
 	JsonObject* obj = NULL;
-	JsonObject* _tmp55_ = NULL;
-	const gchar* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	const gchar* _tmp58_ = NULL;
-	JsonGenerator* _tmp59_ = NULL;
-	JsonGenerator* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
+	JsonObject* _tmp55_;
+	const gchar* _tmp56_;
+	const gchar* _tmp57_;
+	const gchar* _tmp58_;
+	JsonGenerator* _tmp59_;
+	JsonGenerator* _tmp60_;
+	gchar* _tmp61_;
+	gchar* _tmp62_;
 #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"
@@ -5202,10 +5217,10 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
 	_tmp3_ = string_get (_tmp2_, (glong) 0);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp3_ != '/') {
-#line 5175 "GalleryConnector.c"
-		PublishingGallery3PublishingParameters* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+#line 5190 "GalleryConnector.c"
+		PublishingGallery3PublishingParameters* _tmp4_;
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
 #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"
@@ -5216,7 +5231,7 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
 		_tmp6_ = _tmp5_;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:602: %s", _tmp6_);
-#line 5189 "GalleryConnector.c"
+#line 5204 "GalleryConnector.c"
 	}
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = session;
@@ -5300,20 +5315,20 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
 	if (_tmp34_ == NULL) {
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp33_ = TRUE;
-#line 5273 "GalleryConnector.c"
+#line 5288 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp35_ = NULL;
+		const gchar* _tmp35_;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp35_ = title;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp33_ = g_strcmp0 (_tmp35_, "") == 0;
-#line 5280 "GalleryConnector.c"
+#line 5295 "GalleryConnector.c"
 	}
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp33_) {
-#line 5284 "GalleryConnector.c"
-		const gchar* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
+#line 5299 "GalleryConnector.c"
+		const gchar* _tmp36_;
+		gchar* _tmp37_;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp36_ = filename;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5322,7 +5337,7 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
 		_g_free0 (title);
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		title = _tmp37_;
-#line 5295 "GalleryConnector.c"
+#line 5310 "GalleryConnector.c"
 	}
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp38_ = disposition_table;
@@ -5368,11 +5383,11 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
 	if (_tmp52_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp50_ = "movie";
-#line 5341 "GalleryConnector.c"
+#line 5356 "GalleryConnector.c"
 	} else {
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp50_ = "photo";
-#line 5345 "GalleryConnector.c"
+#line 5360 "GalleryConnector.c"
 	}
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp53_ = g_strdup (_tmp50_);
@@ -5432,14 +5447,14 @@ 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 5405 "GalleryConnector.c"
+#line 5420 "GalleryConnector.c"
 }
 
 
 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 5412 "GalleryConnector.c"
+#line 5427 "GalleryConnector.c"
 }
 
 
@@ -5449,19 +5464,19 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 	gchar* new_url = NULL;
 	JsonNode* root_node = NULL;
 	JsonParser* parser = NULL;
-	JsonParser* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	JsonParser* _tmp0_;
+	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	JsonParser* _tmp14_ = NULL;
-	JsonNode* _tmp15_ = NULL;
-	JsonNode* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	JsonNode* _tmp19_ = NULL;
-	JsonObject* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
+	const gchar* _tmp3_;
+	const gchar* _tmp10_;
+	JsonParser* _tmp14_;
+	JsonNode* _tmp15_;
+	JsonNode* _tmp16_;
+	gboolean _tmp17_;
+	JsonNode* _tmp19_;
+	JsonObject* _tmp20_;
+	const gchar* _tmp21_;
+	gchar* _tmp22_;
 	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);
@@ -5481,11 +5496,11 @@ 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 5454 "GalleryConnector.c"
+#line 5469 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = json_object;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5494,14 +5509,14 @@ 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 5467 "GalleryConnector.c"
+#line 5482 "GalleryConnector.c"
 	}
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp2_) {
-#line 5471 "GalleryConnector.c"
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 5486 "GalleryConnector.c"
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp7_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5522,16 +5537,16 @@ 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 5495 "GalleryConnector.c"
+#line 5510 "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 5501 "GalleryConnector.c"
+#line 5516 "GalleryConnector.c"
 	{
-		JsonParser* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		JsonParser* _tmp11_;
+		const gchar* _tmp12_;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp11_ = parser;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5540,7 +5555,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 5513 "GalleryConnector.c"
+#line 5528 "GalleryConnector.c"
 			goto __catch5_g_error;
 		}
 	}
@@ -5548,7 +5563,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 	__catch5_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp13_ = NULL;
+		const gchar* _tmp13_;
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		e = _inner_error_;
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5563,7 +5578,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 5536 "GalleryConnector.c"
+#line 5551 "GalleryConnector.c"
 	}
 	__finally5:
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5580,7 +5595,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 5553 "GalleryConnector.c"
+#line 5568 "GalleryConnector.c"
 	}
 #line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp14_ = parser;
@@ -5594,8 +5609,8 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
 	_tmp17_ = json_node_is_null (_tmp16_);
 #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp17_) {
-#line 5567 "GalleryConnector.c"
-		gchar* _tmp18_ = NULL;
+#line 5582 "GalleryConnector.c"
+		gchar* _tmp18_;
 #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");
@@ -5611,7 +5626,7 @@ 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 5583 "GalleryConnector.c"
+#line 5598 "GalleryConnector.c"
 	}
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp19_ = root_node;
@@ -5633,21 +5648,21 @@ 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 5605 "GalleryConnector.c"
+#line 5620 "GalleryConnector.c"
 }
 
 
 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_ = NULL;
-	PublishingGallery3Session* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_ = NULL;
-	PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingGallery3Session* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_;
+	PublishingGallery3GallerySetTagRelationshipTransaction* _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));
@@ -5683,7 +5698,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 5655 "GalleryConnector.c"
+#line 5670 "GalleryConnector.c"
 		} else {
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_publishing_rest_support_transaction_unref0 (tag_txn);
@@ -5693,7 +5708,7 @@ 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 5665 "GalleryConnector.c"
+#line 5680 "GalleryConnector.c"
 		}
 	}
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5706,20 +5721,20 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh
 	_g_free0 (_tmp8_);
 #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (tag_txn);
-#line 5678 "GalleryConnector.c"
+#line 5693 "GalleryConnector.c"
 }
 
 
 static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self) {
 	gchar* result = NULL;
 	PublishingGallery3GalleryGetItemTagsURLsTransaction* tag_urls_txn = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingGallery3Session* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp3_ = NULL;
-	PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp4_ = NULL;
-	PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingGallery3Session* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp3_;
+	PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp4_;
+	PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp9_;
+	gchar* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL);
@@ -5737,9 +5752,9 @@ 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 5709 "GalleryConnector.c"
+#line 5724 "GalleryConnector.c"
 	{
-		PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_ = NULL;
+		PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_;
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = tag_urls_txn;
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5748,7 +5763,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 5720 "GalleryConnector.c"
+#line 5735 "GalleryConnector.c"
 				goto __catch6_spit_publishing_publishing_error;
 			}
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5759,16 +5774,16 @@ 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 5731 "GalleryConnector.c"
+#line 5746 "GalleryConnector.c"
 		}
 	}
 	goto __finally6;
 	__catch6_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		err = _inner_error_;
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5789,7 +5804,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 5761 "GalleryConnector.c"
+#line 5776 "GalleryConnector.c"
 	}
 	__finally6:
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5802,7 +5817,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 5774 "GalleryConnector.c"
+#line 5789 "GalleryConnector.c"
 	}
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp9_ = tag_urls_txn;
@@ -5814,20 +5829,20 @@ 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 5786 "GalleryConnector.c"
+#line 5801 "GalleryConnector.c"
 }
 
 
 static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag) {
 	gchar* result = NULL;
 	PublishingGallery3GalleryGetTagTransaction* tag_txn = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingGallery3Session* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingGallery3GalleryGetTagTransaction* _tmp3_ = NULL;
-	PublishingGallery3GalleryGetTagTransaction* _tmp4_ = NULL;
-	PublishingGallery3GalleryGetTagTransaction* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingGallery3Session* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingGallery3GalleryGetTagTransaction* _tmp3_;
+	PublishingGallery3GalleryGetTagTransaction* _tmp4_;
+	PublishingGallery3GalleryGetTagTransaction* _tmp9_;
+	gchar* _tmp10_;
 	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);
@@ -5847,9 +5862,9 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	tag_txn = _tmp4_;
-#line 5819 "GalleryConnector.c"
+#line 5834 "GalleryConnector.c"
 	{
-		PublishingGallery3GalleryGetTagTransaction* _tmp5_ = NULL;
+		PublishingGallery3GalleryGetTagTransaction* _tmp5_;
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = tag_txn;
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5858,7 +5873,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 		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 5830 "GalleryConnector.c"
+#line 5845 "GalleryConnector.c"
 				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5869,16 +5884,16 @@ 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 5841 "GalleryConnector.c"
+#line 5856 "GalleryConnector.c"
 		}
 	}
 	goto __finally7;
 	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 #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"
@@ -5899,7 +5914,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 		_publishing_rest_support_transaction_unref0 (tag_txn);
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return result;
-#line 5871 "GalleryConnector.c"
+#line 5886 "GalleryConnector.c"
 	}
 	__finally7:
 #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5912,7 +5927,7 @@ 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 5884 "GalleryConnector.c"
+#line 5899 "GalleryConnector.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp9_ = tag_txn;
@@ -5924,21 +5939,21 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
 	_publishing_rest_support_transaction_unref0 (tag_txn);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 5896 "GalleryConnector.c"
+#line 5911 "GalleryConnector.c"
 }
 
 
 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 5903 "GalleryConnector.c"
+#line 5918 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error) {
-	PublishingGallery3PublishingParameters* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	PublishingGallery3PublishingParameters* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self));
@@ -5952,25 +5967,25 @@ 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 5924 "GalleryConnector.c"
+#line 5939 "GalleryConnector.c"
 		gchar** keywords = NULL;
 		gint keywords_length1 = 0;
 		gint _keywords_size_ = 0;
-		SpitPublishingPublishable* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gchar** _tmp5_ = NULL;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-		gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		SpitPublishingPublishable* _tmp3_;
+		gint _tmp4_;
+		gchar** _tmp5_;
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		const gchar* _tmp11_;
+		const gchar* _tmp12_;
 		gboolean _tmp13_ = FALSE;
-		const gchar* _tmp14_ = NULL;
-		gchar** _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
+		const gchar* _tmp14_;
+		gchar** _tmp17_;
+		gint _tmp17__length1;
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_debug ("GalleryConnector.vala:746: EVENT: evaluating tags");
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5997,7 +6012,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 5969 "GalleryConnector.c"
+#line 5984 "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);
@@ -6033,19 +6048,19 @@ 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 6005 "GalleryConnector.c"
+#line 6020 "GalleryConnector.c"
 		} else {
-			const gchar* _tmp15_ = NULL;
+			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 6012 "GalleryConnector.c"
+#line 6027 "GalleryConnector.c"
 		}
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (_tmp13_) {
-#line 6016 "GalleryConnector.c"
-			GError* _tmp16_ = NULL;
+#line 6031 "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");
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6058,7 +6073,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 6030 "GalleryConnector.c"
+#line 6045 "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);
@@ -6068,14 +6083,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 6040 "GalleryConnector.c"
+#line 6055 "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 6047 "GalleryConnector.c"
+#line 6062 "GalleryConnector.c"
 		{
 			gchar** tag_collection = NULL;
 			gint tag_collection_length1 = 0;
@@ -6087,22 +6102,22 @@ 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 6059 "GalleryConnector.c"
-				gchar* _tmp18_ = NULL;
+#line 6074 "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 6066 "GalleryConnector.c"
+#line 6081 "GalleryConnector.c"
 				{
-					const gchar* _tmp19_ = NULL;
-					const gchar* _tmp20_ = NULL;
-					gchar* _tmp21_ = NULL;
-					gchar* _tmp22_ = NULL;
+					const gchar* _tmp19_;
+					const gchar* _tmp20_;
+					gchar* _tmp21_;
+					gchar* _tmp22_;
 					gchar* new_tag_url = NULL;
-					const gchar* _tmp23_ = NULL;
-					gchar* _tmp24_ = NULL;
+					const gchar* _tmp23_;
+					gchar* _tmp24_;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp19_ = tag;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6121,9 +6136,9 @@ 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 6093 "GalleryConnector.c"
+#line 6108 "GalleryConnector.c"
 					{
-						const gchar* _tmp25_ = NULL;
+						const gchar* _tmp25_;
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp25_ = new_tag_url;
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6132,7 +6147,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 6104 "GalleryConnector.c"
+#line 6119 "GalleryConnector.c"
 								goto __catch8_spit_publishing_publishing_error;
 							}
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6147,17 +6162,17 @@ 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 6119 "GalleryConnector.c"
+#line 6134 "GalleryConnector.c"
 						}
 					}
 					goto __finally8;
 					__catch8_spit_publishing_publishing_error:
 					{
 						GError* err = NULL;
-						GError* _tmp26_ = NULL;
-						const gchar* _tmp27_ = NULL;
-						GError* _tmp28_ = NULL;
-						GError* _tmp29_ = NULL;
+						GError* _tmp26_;
+						const gchar* _tmp27_;
+						GError* _tmp28_;
+						GError* _tmp29_;
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						err = _inner_error_;
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6176,7 +6191,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 6148 "GalleryConnector.c"
+#line 6163 "GalleryConnector.c"
 						goto __finally8;
 					}
 					__finally8:
@@ -6194,7 +6209,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 6166 "GalleryConnector.c"
+#line 6181 "GalleryConnector.c"
 						} else {
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 							_g_free0 (new_tag_url);
@@ -6208,20 +6223,20 @@ 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 6180 "GalleryConnector.c"
+#line 6195 "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 6187 "GalleryConnector.c"
+#line 6202 "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 6193 "GalleryConnector.c"
+#line 6208 "GalleryConnector.c"
 	}
 }
 
@@ -6241,7 +6256,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 6213 "GalleryConnector.c"
+#line 6228 "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);
@@ -6249,7 +6264,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 6221 "GalleryConnector.c"
+#line 6236 "GalleryConnector.c"
 		}
 	}
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6262,7 +6277,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 6234 "GalleryConnector.c"
+#line 6249 "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);
@@ -6270,7 +6285,7 @@ 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 6242 "GalleryConnector.c"
+#line 6257 "GalleryConnector.c"
 		}
 	}
 }
@@ -6284,19 +6299,19 @@ static void publishing_gallery3_gallery_upload_transaction_class_init (Publishin
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	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 6257 "GalleryConnector.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute;
+#line 6272 "GalleryConnector.c"
 }
 
 
 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 6264 "GalleryConnector.c"
+#line 6279 "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);
@@ -6314,7 +6329,7 @@ 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 6286 "GalleryConnector.c"
+#line 6301 "GalleryConnector.c"
 }
 
 
@@ -6332,9 +6347,9 @@ GType publishing_gallery3_gallery_upload_transaction_get_type (void) {
 
 PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingGallery3GalleryPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingGallery3Session* _tmp2_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingGallery3Session* _tmp2_;
 #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,21 +6372,21 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_constr
 	self->priv->session = _tmp2_;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 6329 "GalleryConnector.c"
+#line 6344 "GalleryConnector.c"
 }
 
 
 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 6336 "GalleryConnector.c"
+#line 6351 "GalleryConnector.c"
 }
 
 
 static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingGallery3GalleryPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
 #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6380,15 +6395,15 @@ 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 6352 "GalleryConnector.c"
+#line 6367 "GalleryConnector.c"
 }
 
 
 static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingGallery3GalleryPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6399,17 +6414,17 @@ 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 6371 "GalleryConnector.c"
+#line 6386 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingGallery3GalleryPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 #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"
@@ -6418,7 +6433,7 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl
 	if (_tmp0_) {
 #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 6390 "GalleryConnector.c"
+#line 6405 "GalleryConnector.c"
 	}
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = self->priv->host;
@@ -6426,7 +6441,7 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl
 	if (_tmp1_ == 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 6398 "GalleryConnector.c"
+#line 6413 "GalleryConnector.c"
 	}
 #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:837: GalleryPublisher: starting interaction.");
@@ -6444,28 +6459,28 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl
 	if (NULL == _tmp4_) {
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = TRUE;
-#line 6416 "GalleryConnector.c"
+#line 6431 "GalleryConnector.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
+		const gchar* _tmp5_;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = self->priv->key;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = g_strcmp0 ("", _tmp5_) == 0;
-#line 6423 "GalleryConnector.c"
+#line 6438 "GalleryConnector.c"
 	}
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp3_) {
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 6429 "GalleryConnector.c"
+#line 6444 "GalleryConnector.c"
 	} else {
 		gchar* url = NULL;
-		gchar* _tmp6_ = NULL;
+		gchar* _tmp6_;
 		gchar* username = NULL;
-		gchar* _tmp7_ = NULL;
+		gchar* _tmp7_;
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-		const gchar* _tmp10_ = NULL;
+		const gchar* _tmp10_;
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6480,41 +6495,41 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl
 		if (NULL == _tmp10_) {
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp9_ = TRUE;
-#line 6452 "GalleryConnector.c"
+#line 6467 "GalleryConnector.c"
 		} else {
-			const gchar* _tmp11_ = NULL;
+			const gchar* _tmp11_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp11_ = self->priv->key;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp9_ = NULL == _tmp11_;
-#line 6459 "GalleryConnector.c"
+#line 6474 "GalleryConnector.c"
 		}
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (_tmp9_) {
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp8_ = TRUE;
-#line 6465 "GalleryConnector.c"
+#line 6480 "GalleryConnector.c"
 		} else {
-			const gchar* _tmp12_ = NULL;
+			const gchar* _tmp12_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp12_ = url;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp8_ = NULL == _tmp12_;
-#line 6472 "GalleryConnector.c"
+#line 6487 "GalleryConnector.c"
 		}
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (_tmp8_) {
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 6478 "GalleryConnector.c"
+#line 6493 "GalleryConnector.c"
 		} else {
-			const gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			SpitPublishingPluginHost* _tmp15_ = NULL;
-			PublishingGallery3Session* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			const gchar* _tmp18_ = NULL;
-			const gchar* _tmp19_ = NULL;
+			const gchar* _tmp13_;
+			const gchar* _tmp14_;
+			SpitPublishingPluginHost* _tmp15_;
+			PublishingGallery3Session* _tmp16_;
+			const gchar* _tmp17_;
+			const gchar* _tmp18_;
+			const gchar* _tmp19_;
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp13_ = username;
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6537,13 +6552,13 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl
 			publishing_gallery3_session_authenticate (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
 #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			publishing_gallery3_gallery_publisher_do_fetch_album_urls (self);
-#line 6509 "GalleryConnector.c"
+#line 6524 "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 6515 "GalleryConnector.c"
+#line 6530 "GalleryConnector.c"
 	}
 }
 
@@ -6556,14 +6571,14 @@ 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 6528 "GalleryConnector.c"
+#line 6543 "GalleryConnector.c"
 }
 
 
 gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL);
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6574,13 +6589,13 @@ 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 6546 "GalleryConnector.c"
+#line 6561 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -6591,14 +6606,14 @@ void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3Galler
 	_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 6563 "GalleryConnector.c"
+#line 6578 "GalleryConnector.c"
 }
 
 
 gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL);
 #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6609,13 +6624,13 @@ 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 6581 "GalleryConnector.c"
+#line 6596 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -6626,14 +6641,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3Ga
 	_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 6598 "GalleryConnector.c"
+#line 6613 "GalleryConnector.c"
 }
 
 
 gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL);
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6644,13 +6659,13 @@ 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 6616 "GalleryConnector.c"
+#line 6631 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -6661,7 +6676,7 @@ void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGalle
 	_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 6633 "GalleryConnector.c"
+#line 6648 "GalleryConnector.c"
 }
 
 
@@ -6673,22 +6688,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 6645 "GalleryConnector.c"
+#line 6660 "GalleryConnector.c"
 }
 
 
 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 6652 "GalleryConnector.c"
+#line 6667 "GalleryConnector.c"
 }
 
 
 gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self) {
 	gboolean* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean* _tmp2_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
+	gboolean* _tmp2_;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL);
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6701,13 +6716,13 @@ 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 6673 "GalleryConnector.c"
+#line 6688 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -6716,7 +6731,7 @@ void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (Publis
 	_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 6688 "GalleryConnector.c"
+#line 6703 "GalleryConnector.c"
 }
 
 
@@ -6728,22 +6743,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 6700 "GalleryConnector.c"
+#line 6715 "GalleryConnector.c"
 }
 
 
 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 6707 "GalleryConnector.c"
+#line 6722 "GalleryConnector.c"
 }
 
 
 gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self) {
 	gint* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint* _tmp2_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
+	gint* _tmp2_;
 #line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL);
 #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6756,13 +6771,13 @@ 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 6728 "GalleryConnector.c"
+#line 6743 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	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"
@@ -6771,15 +6786,15 @@ void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (Publishing
 	_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 6743 "GalleryConnector.c"
+#line 6758 "GalleryConnector.c"
 }
 
 
 gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self) {
 	gint* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint* _tmp2_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
+	gint* _tmp2_;
 #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL);
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6792,13 +6807,13 @@ 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 6764 "GalleryConnector.c"
+#line 6779 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	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"
@@ -6807,19 +6822,19 @@ void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery
 	_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 6779 "GalleryConnector.c"
+#line 6794 "GalleryConnector.c"
 }
 
 
 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 6786 "GalleryConnector.c"
+#line 6801 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6828,41 +6843,41 @@ 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 6800 "GalleryConnector.c"
+#line 6815 "GalleryConnector.c"
 }
 
 
 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 6807 "GalleryConnector.c"
+#line 6822 "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) {
 #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 6814 "GalleryConnector.c"
+#line 6829 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode) {
-	PublishingGallery3CredentialsPaneMode _tmp0_ = 0;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingGallery3Session* _tmp3_ = NULL;
+	PublishingGallery3CredentialsPaneMode _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingGallery3Session* _tmp3_;
 	PublishingGallery3CredentialsPane* creds_pane = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	PublishingGallery3CredentialsPaneMode _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	PublishingGallery3CredentialsPane* _tmp12_ = NULL;
-	PublishingGallery3CredentialsPane* _tmp13_ = NULL;
-	SpitPublishingPluginHost* _tmp14_ = NULL;
+	SpitPublishingPluginHost* _tmp4_;
+	PublishingGallery3CredentialsPaneMode _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	PublishingGallery3CredentialsPane* _tmp12_;
+	PublishingGallery3CredentialsPane* _tmp13_;
+	SpitPublishingPluginHost* _tmp14_;
 #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"
@@ -6918,34 +6933,34 @@ static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (Publ
 	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);
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (creds_pane);
-#line 6889 "GalleryConnector.c"
+#line 6904 "GalleryConnector.c"
 }
 
 
 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 6896 "GalleryConnector.c"
+#line 6911 "GalleryConnector.c"
 }
 
 
 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 6903 "GalleryConnector.c"
+#line 6918 "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_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
 	PublishingGallery3KeyFetchTransaction* fetch_trans = NULL;
-	PublishingGallery3Session* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	PublishingGallery3KeyFetchTransaction* _tmp7_ = NULL;
+	PublishingGallery3Session* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	PublishingGallery3KeyFetchTransaction* _tmp7_;
 	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));
@@ -6981,7 +6996,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
 	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 6952 "GalleryConnector.c"
+#line 6967 "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_);
@@ -6989,7 +7004,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 6960 "GalleryConnector.c"
+#line 6975 "GalleryConnector.c"
 				goto __catch9_spit_publishing_publishing_error;
 			}
 #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7000,14 +7015,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 6971 "GalleryConnector.c"
+#line 6986 "GalleryConnector.c"
 		}
 	}
 	goto __finally9;
 	__catch9_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp8_ = NULL;
+		GError* _tmp8_;
 #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"
@@ -7020,7 +7035,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
 		publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp8_);
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 6991 "GalleryConnector.c"
+#line 7006 "GalleryConnector.c"
 	}
 	__finally9:
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7033,33 +7048,33 @@ 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 7004 "GalleryConnector.c"
+#line 7019 "GalleryConnector.c"
 	}
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (fetch_trans);
-#line 7008 "GalleryConnector.c"
+#line 7023 "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) {
 #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 7015 "GalleryConnector.c"
+#line 7030 "GalleryConnector.c"
 }
 
 
 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 7022 "GalleryConnector.c"
+#line 7037 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingGallery3GetAlbumURLsTransaction* album_trans = NULL;
-	PublishingGallery3Session* _tmp1_ = NULL;
-	PublishingGallery3GetAlbumURLsTransaction* _tmp2_ = NULL;
+	PublishingGallery3Session* _tmp1_;
+	PublishingGallery3GetAlbumURLsTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -7077,7 +7092,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 7048 "GalleryConnector.c"
+#line 7063 "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_);
@@ -7085,7 +7100,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 7056 "GalleryConnector.c"
+#line 7071 "GalleryConnector.c"
 				goto __catch10_spit_publishing_publishing_error;
 			}
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7096,14 +7111,14 @@ 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 7067 "GalleryConnector.c"
+#line 7082 "GalleryConnector.c"
 		}
 	}
 	goto __finally10;
 	__catch10_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		err = _inner_error_;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7116,7 +7131,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 7087 "GalleryConnector.c"
+#line 7102 "GalleryConnector.c"
 	}
 	__finally10:
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7129,35 +7144,35 @@ 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 7100 "GalleryConnector.c"
+#line 7115 "GalleryConnector.c"
 	}
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7104 "GalleryConnector.c"
+#line 7119 "GalleryConnector.c"
 }
 
 
 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 7111 "GalleryConnector.c"
+#line 7126 "GalleryConnector.c"
 }
 
 
 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 7118 "GalleryConnector.c"
+#line 7133 "GalleryConnector.c"
 }
 
 
 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_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	guint _tmp2_ = 0U;
-	PublishingGallery3GetAlbumsTransaction* _tmp3_ = NULL;
+	PublishingGallery3Session* _tmp0_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	guint _tmp2_;
+	PublishingGallery3GetAlbumsTransaction* _tmp3_;
 	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));
@@ -7177,7 +7192,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
 	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 7148 "GalleryConnector.c"
+#line 7163 "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_);
@@ -7185,7 +7200,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 7156 "GalleryConnector.c"
+#line 7171 "GalleryConnector.c"
 				goto __catch11_spit_publishing_publishing_error;
 			}
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7196,14 +7211,14 @@ 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 7167 "GalleryConnector.c"
+#line 7182 "GalleryConnector.c"
 		}
 	}
 	goto __finally11;
 	__catch11_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #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"
@@ -7214,7 +7229,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
 		publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp4_);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 7185 "GalleryConnector.c"
+#line 7200 "GalleryConnector.c"
 	}
 	__finally11:
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7227,48 +7242,48 @@ 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 7198 "GalleryConnector.c"
+#line 7213 "GalleryConnector.c"
 	}
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7202 "GalleryConnector.c"
+#line 7217 "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) {
 #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 7209 "GalleryConnector.c"
+#line 7224 "GalleryConnector.c"
 }
 
 
 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 7216 "GalleryConnector.c"
+#line 7231 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username) {
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	PublishingGallery3Album** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	GtkBuilder* _tmp14_ = NULL;
-	gboolean* _tmp15_ = NULL;
-	gboolean* _tmp16_ = NULL;
-	gint* _tmp17_ = NULL;
-	gint* _tmp18_ = NULL;
-	gint* _tmp19_ = NULL;
-	gint* _tmp20_ = NULL;
-	PublishingGallery3PublishingOptionsPane* _tmp21_ = NULL;
-	PublishingGallery3PublishingOptionsPane* _tmp22_ = NULL;
-	PublishingGallery3PublishingOptionsPane* _tmp23_ = NULL;
-	SpitPublishingPluginHost* _tmp24_ = NULL;
-	PublishingGallery3PublishingOptionsPane* _tmp25_ = NULL;
+	GtkBuilder* _tmp0_;
+	SpitPublishingPluginHost* _tmp9_;
+	const gchar* _tmp10_;
+	const gchar* _tmp11_;
+	PublishingGallery3Album** _tmp12_;
+	gint _tmp12__length1;
+	GtkBuilder* _tmp13_;
+	gboolean* _tmp14_;
+	gboolean* _tmp15_;
+	gint* _tmp16_;
+	gint* _tmp17_;
+	gint* _tmp18_;
+	gint* _tmp19_;
+	PublishingGallery3PublishingOptionsPane* _tmp20_;
+	PublishingGallery3PublishingOptionsPane* _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));
@@ -7282,16 +7297,16 @@ 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 7253 "GalleryConnector.c"
+#line 7268 "GalleryConnector.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
+		GtkBuilder* _tmp1_;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = builder;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		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 7262 "GalleryConnector.c"
+#line 7277 "GalleryConnector.c"
 			goto __catch12_g_error;
 		}
 	}
@@ -7299,14 +7314,13 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
 	__catch12_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
+		SpitPublishingPluginHost* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		GError* _tmp7_;
+		GError* _tmp8_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		e = _inner_error_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7320,29 +7334,27 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = self->priv->host;
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \
-"continue.");
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME);
+		_tmp5_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \
+"continue."), PUBLISHING_GALLERY3_SERVICE_NAME);
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_);
+		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp9_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_);
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_error_free0 (_tmp9_);
+		_g_error_free0 (_tmp8_);
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (e);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_object_unref0 (builder);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7312 "GalleryConnector.c"
+#line 7324 "GalleryConnector.c"
 	}
 	__finally12:
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7355,83 +7367,83 @@ 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 7325 "GalleryConnector.c"
+#line 7337 "GalleryConnector.c"
 	}
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = self->priv->host;
+	_tmp9_ = self->priv->host;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = url;
+	_tmp10_ = url;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = username;
+	_tmp11_ = username;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = self->priv->albums;
+	_tmp12_ = self->priv->albums;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13__length1 = self->priv->albums_length1;
+	_tmp12__length1 = self->priv->albums_length1;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = builder;
+	_tmp13_ = builder;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self);
+	_tmp14_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self);
+	_tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = _tmp17_;
+	_tmp17_ = _tmp16_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self);
+	_tmp18_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp21_ = publishing_gallery3_publishing_options_pane_new (_tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp13__length1, _tmp14_, *_tmp16_, *_tmp18_, *_tmp20_);
+	_tmp20_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_, *_tmp15_, *_tmp17_, *_tmp19_);
 #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 = _tmp21_;
+	self->priv->publishing_options_pane = _tmp20_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp20_);
+	_g_free0 (_tmp19_);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp18_);
+	_g_free0 (_tmp17_);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp16_);
+	_g_free0 (_tmp15_);
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp22_ = self->priv->publishing_options_pane;
+	_tmp21_ = self->priv->publishing_options_pane;
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp22_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp21_, "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"
-	_tmp23_ = self->priv->publishing_options_pane;
+	_tmp22_ = self->priv->publishing_options_pane;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp23_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp22_, "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"
-	_tmp24_ = self->priv->host;
+	_tmp23_ = self->priv->host;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp25_ = self->priv->publishing_options_pane;
+	_tmp24_ = self->priv->publishing_options_pane;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	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);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_object_unref0 (builder);
-#line 7379 "GalleryConnector.c"
+#line 7391 "GalleryConnector.c"
 }
 
 
 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 7386 "GalleryConnector.c"
+#line 7398 "GalleryConnector.c"
 }
 
 
 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 7393 "GalleryConnector.c"
+#line 7405 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
 	PublishingGallery3GalleryAlbumCreateTransaction* album_trans = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp1_ = NULL;
-	PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_ = NULL;
+	PublishingGallery3Session* _tmp0_;
+	PublishingGallery3PublishingParameters* _tmp1_;
+	PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_;
 	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));
@@ -7451,7 +7463,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
 	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 7421 "GalleryConnector.c"
+#line 7433 "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_);
@@ -7459,7 +7471,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 7429 "GalleryConnector.c"
+#line 7441 "GalleryConnector.c"
 				goto __catch13_spit_publishing_publishing_error;
 			}
 #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7470,14 +7482,14 @@ 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 7440 "GalleryConnector.c"
+#line 7452 "GalleryConnector.c"
 		}
 	}
 	goto __finally13;
 	__catch13_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #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"
@@ -7488,7 +7500,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
 		publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_);
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 7458 "GalleryConnector.c"
+#line 7470 "GalleryConnector.c"
 	}
 	__finally13:
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7501,71 +7513,71 @@ 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 7471 "GalleryConnector.c"
+#line 7483 "GalleryConnector.c"
 	}
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7475 "GalleryConnector.c"
+#line 7487 "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) {
 #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 7482 "GalleryConnector.c"
+#line 7494 "GalleryConnector.c"
 }
 
 
 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 7489 "GalleryConnector.c"
+#line 7501 "GalleryConnector.c"
 }
 
 
 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 7496 "GalleryConnector.c"
+#line 7508 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
-	PublishingGallery3PublishingParameters* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	PublishingGallery3PublishingParameters* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 	gint _tmp3_ = 0;
-	PublishingGallery3PublishingParameters* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	PublishingGallery3PublishingParameters* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	SpitPublishingPluginHost* _tmp11_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	PublishingGallery3PublishingParameters* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp17_ = FALSE;
-	void* _tmp18_ = NULL;
-	GDestroyNotify _tmp19_ = NULL;
-	SpitPublishingProgressCallback _tmp20_ = NULL;
-	gboolean _tmp21_ = FALSE;
+	PublishingGallery3PublishingParameters* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	PublishingGallery3PublishingParameters* _tmp7_;
+	gint _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_;
 	PublishingGallery3Uploader* uploader = NULL;
-	PublishingGallery3Session* _tmp22_ = NULL;
-	SpitPublishingPluginHost* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	SpitPublishingPublishable** _tmp25_ = NULL;
-	SpitPublishingPublishable** _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	PublishingGallery3PublishingParameters* _tmp27_ = NULL;
-	PublishingGallery3Uploader* _tmp28_ = NULL;
-	PublishingGallery3Uploader* _tmp29_ = NULL;
-	PublishingGallery3Uploader* _tmp30_ = NULL;
-	PublishingGallery3Uploader* _tmp31_ = NULL;
-	PublishingGallery3Uploader* _tmp32_ = 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_;
 #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"
@@ -7590,11 +7602,11 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3
 	if (_tmp6_ <= 0) {
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = 0;
-#line 7560 "GalleryConnector.c"
+#line 7572 "GalleryConnector.c"
 	} else {
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = 1;
-#line 7564 "GalleryConnector.c"
+#line 7576 "GalleryConnector.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp3_);
@@ -7646,7 +7658,7 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3
 	if (!_tmp21_) {
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7616 "GalleryConnector.c"
+#line 7628 "GalleryConnector.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp22_ = self->priv->session;
@@ -7682,13 +7694,13 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3
 	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);
 #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 7652 "GalleryConnector.c"
+#line 7664 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
 #line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7701,12 +7713,12 @@ 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 7671 "GalleryConnector.c"
+#line 7683 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #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"
@@ -7715,25 +7727,25 @@ static void publishing_gallery3_gallery_publisher_on_service_welcome_login (Publ
 	if (!_tmp0_) {
 #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7685 "GalleryConnector.c"
+#line 7697 "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 7691 "GalleryConnector.c"
+#line 7703 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
 #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"
@@ -7748,7 +7760,7 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi
 	if (!_tmp0_) {
 #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7717 "GalleryConnector.c"
+#line 7729 "GalleryConnector.c"
 	}
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = username;
@@ -7771,12 +7783,12 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi
 	_tmp6_ = password;
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_do_network_login (self, _tmp4_, _tmp5_, _tmp6_);
-#line 7739 "GalleryConnector.c"
+#line 7751 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #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"
@@ -7785,29 +7797,29 @@ static void publishing_gallery3_gallery_publisher_on_credentials_go_back (Publis
 	if (!_tmp0_) {
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7753 "GalleryConnector.c"
+#line 7765 "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 7759 "GalleryConnector.c"
+#line 7771 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingRESTSupportTransaction* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingRESTSupportTransaction* _tmp10_;
+	guint _tmp11_;
 #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"
@@ -7830,7 +7842,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing
 	if (!_tmp4_) {
 #line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7798 "GalleryConnector.c"
+#line 7810 "GalleryConnector.c"
 	}
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -7840,7 +7852,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing
 	if (_tmp6_) {
 #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7808 "GalleryConnector.c"
+#line 7820 "GalleryConnector.c"
 	}
 #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = bad_txn;
@@ -7860,10 +7872,10 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing
 	if (_tmp11_ == ((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 7828 "GalleryConnector.c"
+#line 7840 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_ = NULL;
-		guint _tmp13_ = 0U;
+		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"
@@ -7872,33 +7884,33 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing
 		if (_tmp13_ == ((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 7840 "GalleryConnector.c"
+#line 7852 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			SpitPublishingPluginHost* _tmp14_;
+			GError* _tmp15_;
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp14_ = self->priv->host;
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp15_ = err;
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 7850 "GalleryConnector.c"
+#line 7862 "GalleryConnector.c"
 		}
 	}
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
 #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"
@@ -7921,7 +7933,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish
 	if (!_tmp4_) {
 #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7889 "GalleryConnector.c"
+#line 7901 "GalleryConnector.c"
 	}
 #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -7931,7 +7943,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish
 	if (_tmp6_) {
 #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7899 "GalleryConnector.c"
+#line 7911 "GalleryConnector.c"
 	}
 #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = txn;
@@ -7947,17 +7959,17 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish
 	if (_tmp9_ == NULL) {
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		g_error ("GalleryConnector.vala:1178: key doesn\'t exist");
-#line 7915 "GalleryConnector.c"
+#line 7927 "GalleryConnector.c"
 	} else {
 		gchar* url = NULL;
-		gchar* _tmp10_ = NULL;
+		gchar* _tmp10_;
 		gchar* username = NULL;
-		gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		PublishingGallery3Session* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+		gchar* _tmp11_;
+		const gchar* _tmp12_;
+		PublishingGallery3Session* _tmp13_;
+		const gchar* _tmp14_;
+		const gchar* _tmp15_;
+		const gchar* _tmp16_;
 #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp10_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
 #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7988,24 +8000,24 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish
 		_g_free0 (username);
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url);
-#line 7956 "GalleryConnector.c"
+#line 7968 "GalleryConnector.c"
 	}
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingRESTSupportTransaction* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingRESTSupportTransaction* _tmp10_;
+	guint _tmp11_;
 #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"
@@ -8028,7 +8040,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub
 	if (!_tmp4_) {
 #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 7996 "GalleryConnector.c"
+#line 8008 "GalleryConnector.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -8038,7 +8050,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub
 	if (!_tmp6_) {
 #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8006 "GalleryConnector.c"
+#line 8018 "GalleryConnector.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = bad_txn;
@@ -8058,10 +8070,10 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub
 	if (_tmp11_ == ((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 8026 "GalleryConnector.c"
+#line 8038 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_ = NULL;
-		guint _tmp13_ = 0U;
+		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"
@@ -8070,38 +8082,38 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub
 		if (_tmp13_ == ((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 8038 "GalleryConnector.c"
+#line 8050 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			SpitPublishingPluginHost* _tmp14_;
+			GError* _tmp15_;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp14_ = self->priv->host;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp15_ = err;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8048 "GalleryConnector.c"
+#line 8060 "GalleryConnector.c"
 		}
 	}
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
 	gchar** album_urls = NULL;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gchar** _tmp9_ = NULL;
-	gint album_urls_length1 = 0;
-	gint _album_urls_size_ = 0;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gint _tmp8_;
+	gchar** _tmp9_;
+	gint album_urls_length1;
+	gint _album_urls_size_;
+	gchar** _tmp10_;
+	gint _tmp10__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"
@@ -8124,7 +8136,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (
 	if (!_tmp4_) {
 #line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8092 "GalleryConnector.c"
+#line 8104 "GalleryConnector.c"
 	}
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -8134,7 +8146,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (
 	if (!_tmp6_) {
 #line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8102 "GalleryConnector.c"
+#line 8114 "GalleryConnector.c"
 	}
 #line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_debug ("GalleryConnector.vala:1242: EVENT: retrieving all album URLs.");
@@ -8154,19 +8166,19 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (
 	_tmp10__length1 = album_urls_length1;
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (NULL == _tmp10_) {
-#line 8122 "GalleryConnector.c"
+#line 8134 "GalleryConnector.c"
 		gchar* url = NULL;
-		PublishingGallery3Session* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+		PublishingGallery3Session* _tmp11_;
+		const gchar* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
 		gchar* username = NULL;
-		PublishingGallery3Session* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
+		PublishingGallery3Session* _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
+		gchar* _tmp18_;
+		const gchar* _tmp19_;
+		const gchar* _tmp20_;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp11_ = self->priv->session;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8197,37 +8209,37 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (
 		_g_free0 (username);
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url);
-#line 8165 "GalleryConnector.c"
+#line 8177 "GalleryConnector.c"
 	} else {
-		gchar** _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
+		gchar** _tmp21_;
+		gint _tmp21__length1;
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp21_ = album_urls;
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp21__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 8175 "GalleryConnector.c"
+#line 8187 "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 8179 "GalleryConnector.c"
+#line 8191 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingRESTSupportTransaction* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingRESTSupportTransaction* _tmp10_;
+	guint _tmp11_;
 #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"
@@ -8250,7 +8262,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi
 	if (!_tmp4_) {
 #line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8218 "GalleryConnector.c"
+#line 8230 "GalleryConnector.c"
 	}
 #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -8260,7 +8272,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi
 	if (!_tmp6_) {
 #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8228 "GalleryConnector.c"
+#line 8240 "GalleryConnector.c"
 	}
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = bad_txn;
@@ -8280,10 +8292,10 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi
 	if (_tmp11_ == ((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 8248 "GalleryConnector.c"
+#line 8260 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_ = NULL;
-		guint _tmp13_ = 0U;
+		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"
@@ -8292,53 +8304,53 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi
 		if (_tmp13_ == ((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 8260 "GalleryConnector.c"
+#line 8272 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			SpitPublishingPluginHost* _tmp14_;
+			GError* _tmp15_;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp14_ = 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 8270 "GalleryConnector.c"
+#line 8282 "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 8283 "GalleryConnector.c"
+#line 8295 "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 8289 "GalleryConnector.c"
+#line 8301 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
 	PublishingGallery3Album** new_albums = NULL;
-	gint new_albums_length1 = 0;
-	gint _new_albums_size_ = 0;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
-	gboolean _tmp25_ = FALSE;
+	gint new_albums_length1;
+	gint _new_albums_size_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
+	PublishingRESTSupportTransaction* _tmp23_;
+	gboolean _tmp24_;
+	gboolean _tmp25_;
 	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));
@@ -8370,7 +8382,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		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 8338 "GalleryConnector.c"
+#line 8350 "GalleryConnector.c"
 	}
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -8382,21 +8394,21 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		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 8350 "GalleryConnector.c"
+#line 8362 "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 8354 "GalleryConnector.c"
+#line 8366 "GalleryConnector.c"
 	{
 		PublishingGallery3Album** _tmp7_ = NULL;
-		PublishingRESTSupportTransaction* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		PublishingGallery3Album** _tmp10_ = NULL;
-		gint _tmp7__length1 = 0;
-		gint __tmp7__size_ = 0;
-		PublishingGallery3Album** _tmp11_ = NULL;
-		gint _tmp11__length1 = 0;
+		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;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8411,7 +8423,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		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 8378 "GalleryConnector.c"
+#line 8390 "GalleryConnector.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8422,7 +8434,7 @@ 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 8389 "GalleryConnector.c"
+#line 8401 "GalleryConnector.c"
 		}
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp11_ = _tmp7_;
@@ -8442,14 +8454,14 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		_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 8409 "GalleryConnector.c"
+#line 8421 "GalleryConnector.c"
 	}
 	goto __finally14;
 	__catch14_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		PublishingRESTSupportTransaction* _tmp12_ = NULL;
-		GError* _tmp13_ = NULL;
+		PublishingRESTSupportTransaction* _tmp12_;
+		GError* _tmp13_;
 #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"
@@ -8462,7 +8474,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		publishing_gallery3_gallery_publisher_on_album_fetch_error (self, _tmp12_, _tmp13_);
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_error_free0 (err);
-#line 8429 "GalleryConnector.c"
+#line 8441 "GalleryConnector.c"
 	}
 	__finally14:
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8475,39 +8487,39 @@ 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 8442 "GalleryConnector.c"
+#line 8454 "GalleryConnector.c"
 	}
 	{
 		gint i = 0;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = 0;
-#line 8448 "GalleryConnector.c"
+#line 8460 "GalleryConnector.c"
 		{
 			gboolean _tmp14_ = FALSE;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp14_ = TRUE;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			while (TRUE) {
-#line 8455 "GalleryConnector.c"
-				gint _tmp16_ = 0;
-				PublishingGallery3Album** _tmp17_ = NULL;
-				gint _tmp17__length1 = 0;
-				PublishingGallery3Album** _tmp18_ = NULL;
-				gint _tmp18__length1 = 0;
-				PublishingGallery3Album** _tmp19_ = NULL;
-				gint _tmp19__length1 = 0;
-				gint _tmp20_ = 0;
-				PublishingGallery3Album* _tmp21_ = NULL;
-				PublishingGallery3Album* _tmp22_ = NULL;
+#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 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp14_) {
-#line 8468 "GalleryConnector.c"
-					gint _tmp15_ = 0;
+#line 8480 "GalleryConnector.c"
+					gint _tmp15_;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp15_ = i;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					i = _tmp15_ + 1;
-#line 8474 "GalleryConnector.c"
+#line 8486 "GalleryConnector.c"
 				}
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp14_ = FALSE;
@@ -8521,7 +8533,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 				if (!(_tmp16_ <= (_tmp17__length1 - 1))) {
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					break;
-#line 8488 "GalleryConnector.c"
+#line 8500 "GalleryConnector.c"
 				}
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp18_ = self->priv->albums;
@@ -8539,7 +8551,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 				_tmp22_ = _publishing_gallery3_album_ref0 (_tmp21_);
 #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 8506 "GalleryConnector.c"
+#line 8518 "GalleryConnector.c"
 			}
 		}
 	}
@@ -8551,15 +8563,15 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 	_tmp25_ = _tmp24_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp25_) {
-#line 8518 "GalleryConnector.c"
-		PublishingRESTSupportTransaction* _tmp26_ = NULL;
-		gchar** _tmp27_ = NULL;
-		gint _tmp27__length1 = 0;
-		gchar** _tmp28_ = NULL;
-		gint _tmp28__length1 = 0;
-		PublishingRESTSupportTransaction* _tmp29_ = NULL;
-		guint _tmp30_ = 0U;
-		guint _tmp31_ = 0U;
+#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;
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8576,20 +8588,20 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		_tmp31_ = _tmp30_;
 #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 8543 "GalleryConnector.c"
+#line 8555 "GalleryConnector.c"
 	} else {
 		gchar* url = NULL;
-		PublishingGallery3Session* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-		gchar* _tmp35_ = NULL;
+		PublishingGallery3Session* _tmp32_;
+		const gchar* _tmp33_;
+		const gchar* _tmp34_;
+		gchar* _tmp35_;
 		gchar* username = NULL;
-		PublishingGallery3Session* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
+		PublishingGallery3Session* _tmp36_;
+		const gchar* _tmp37_;
+		const gchar* _tmp38_;
+		gchar* _tmp39_;
+		const gchar* _tmp40_;
+		const gchar* _tmp41_;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp32_ = self->priv->session;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8620,27 +8632,27 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
 		_g_free0 (username);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (url);
-#line 8587 "GalleryConnector.c"
+#line 8599 "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 8591 "GalleryConnector.c"
+#line 8603 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingRESTSupportTransaction* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingRESTSupportTransaction* _tmp10_;
+	guint _tmp11_;
 #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"
@@ -8663,7 +8675,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish
 	if (!_tmp4_) {
 #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8630 "GalleryConnector.c"
+#line 8642 "GalleryConnector.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -8673,7 +8685,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish
 	if (!_tmp6_) {
 #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8640 "GalleryConnector.c"
+#line 8652 "GalleryConnector.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = bad_txn;
@@ -8693,10 +8705,10 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish
 	if (_tmp11_ == ((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 8660 "GalleryConnector.c"
+#line 8672 "GalleryConnector.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp12_ = NULL;
-		guint _tmp13_ = 0U;
+		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"
@@ -8705,43 +8717,43 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish
 		if (_tmp13_ == ((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 8672 "GalleryConnector.c"
+#line 8684 "GalleryConnector.c"
 		} else {
-			SpitPublishingPluginHost* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			SpitPublishingPluginHost* _tmp14_;
+			GError* _tmp15_;
 #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;
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8682 "GalleryConnector.c"
+#line 8694 "GalleryConnector.c"
 		}
 	}
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
 	PublishingGallery3PublishingParameters* new_params = NULL;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp8_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp9_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp10_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp11_ = NULL;
-	PublishingRESTSupportTransaction* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp18_ = NULL;
+	PublishingRESTSupportTransaction* _tmp7_;
+	PublishingGallery3PublishingParameters* _tmp8_;
+	PublishingGallery3PublishingParameters* _tmp9_;
+	PublishingGallery3PublishingParameters* _tmp10_;
+	PublishingGallery3PublishingParameters* _tmp11_;
+	PublishingRESTSupportTransaction* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	PublishingGallery3PublishingParameters* _tmp15_;
+	const gchar* _tmp16_;
+	const gchar* _tmp17_;
+	PublishingGallery3PublishingParameters* _tmp18_;
 #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"
@@ -8764,7 +8776,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ
 	if (!_tmp4_) {
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8731 "GalleryConnector.c"
+#line 8743 "GalleryConnector.c"
 	}
 #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -8774,7 +8786,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ
 	if (!_tmp6_) {
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8741 "GalleryConnector.c"
+#line 8753 "GalleryConnector.c"
 	}
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = txn;
@@ -8813,42 +8825,42 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ
 	publishing_gallery3_gallery_publisher_do_publish (self, _tmp18_);
 #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_publishing_gallery3_publishing_parameters_unref0 (new_params);
-#line 8779 "GalleryConnector.c"
+#line 8791 "GalleryConnector.c"
 }
 
 
 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 8786 "GalleryConnector.c"
+#line 8798 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	PublishingGallery3Uploader* uploader = NULL;
-	PublishingRESTSupportBatchUploader* _tmp1_ = NULL;
-	PublishingGallery3Uploader* _tmp2_ = NULL;
+	PublishingRESTSupportBatchUploader* _tmp1_;
+	PublishingGallery3Uploader* _tmp2_;
 	GError* g3_err = NULL;
-	GError* _tmp3_ = NULL;
-	GError* _tmp4_ = NULL;
-	GError* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	PublishingGallery3Uploader* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	PublishingGallery3Uploader* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	guint _tmp12_ = 0U;
-	PublishingGallery3Uploader* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	PublishingGallery3Uploader* _tmp15_ = NULL;
-	guint _tmp16_ = 0U;
-	PublishingGallery3Uploader* _tmp17_ = NULL;
-	guint _tmp18_ = 0U;
-	guint _tmp19_ = 0U;
-	SpitPublishingPluginHost* _tmp36_ = NULL;
-	GError* _tmp37_ = NULL;
+	GError* _tmp3_;
+	GError* _tmp4_;
+	GError* _tmp5_;
+	const gchar* _tmp6_;
+	PublishingGallery3Uploader* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	PublishingGallery3Uploader* _tmp10_;
+	guint _tmp11_;
+	guint _tmp12_;
+	PublishingGallery3Uploader* _tmp13_;
+	guint _tmp14_;
+	PublishingGallery3Uploader* _tmp15_;
+	guint _tmp16_;
+	PublishingGallery3Uploader* _tmp17_;
+	guint _tmp18_;
+	guint _tmp19_;
+	SpitPublishingPluginHost* _tmp36_;
+	GError* _tmp37_;
 #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"
@@ -8859,7 +8871,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa
 	if (!_tmp0_) {
 #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8825 "GalleryConnector.c"
+#line 8837 "GalleryConnector.c"
 	}
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = _uploader;
@@ -8911,19 +8923,19 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa
 	_tmp19_ = _tmp18_;
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp19_ == ((guint) 400)) {
-#line 8877 "GalleryConnector.c"
-		GError* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		PublishingGallery3Uploader* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		PublishingGallery3Uploader* _tmp29_ = NULL;
-		SpitPublishingPublisherMediaType _tmp30_ = 0;
-		SpitPublishingPublisherMediaType _tmp31_ = 0;
+#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_;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp20_ = g3_err;
 #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8956,11 +8968,11 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa
 		_tmp31_ = _tmp30_;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		if (_tmp31_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 8922 "GalleryConnector.c"
-			GError* _tmp32_ = NULL;
-			GError* _tmp33_ = NULL;
-			const gchar* _tmp34_ = NULL;
-			gchar* _tmp35_ = NULL;
+#line 8934 "GalleryConnector.c"
+			GError* _tmp32_;
+			GError* _tmp33_;
+			const gchar* _tmp34_;
+			gchar* _tmp35_;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp32_ = g3_err;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8973,7 +8985,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa
 			_g_free0 (_tmp33_->message);
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp33_->message = _tmp35_;
-#line 8939 "GalleryConnector.c"
+#line 8951 "GalleryConnector.c"
 		}
 	}
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8986,19 +8998,19 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa
 	_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 8952 "GalleryConnector.c"
+#line 8964 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_ = FALSE;
-	gdouble _tmp1_ = 0.0;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gboolean _tmp0_;
+	gdouble _tmp1_;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
 #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"
@@ -9007,7 +9019,7 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ
 	if (!_tmp0_) {
 #line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 8973 "GalleryConnector.c"
+#line 8985 "GalleryConnector.c"
 	}
 #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp1_ = completed_fraction;
@@ -9030,19 +9042,19 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ
 	_tmp5_ = completed_fraction;
 #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 8995 "GalleryConnector.c"
+#line 9007 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gint _tmp7_ = 0;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
+	gboolean _tmp6_;
+	gint _tmp7_;
 #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"
@@ -9065,7 +9077,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin
 	if (!_tmp4_) {
 #line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9030 "GalleryConnector.c"
+#line 9042 "GalleryConnector.c"
 	}
 #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp5_ = self->priv->session;
@@ -9075,7 +9087,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin
 	if (!_tmp6_) {
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9040 "GalleryConnector.c"
+#line 9052 "GalleryConnector.c"
 	}
 #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = num_published;
@@ -9084,17 +9096,17 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin
 "shed", _tmp7_);
 #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_do_show_success_pane (self);
-#line 9048 "GalleryConnector.c"
+#line 9060 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self) {
-	PublishingGallery3PublishingOptionsPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingGallery3PublishingOptionsPane* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3Session* _tmp5_ = NULL;
+	PublishingGallery3PublishingOptionsPane* _tmp0_;
+	guint _tmp1_;
+	PublishingGallery3PublishingOptionsPane* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingGallery3Session* _tmp5_;
 #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"
@@ -9115,7 +9127,7 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log
 	if (!_tmp4_) {
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9079 "GalleryConnector.c"
+#line 9091 "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.");
@@ -9125,18 +9137,18 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log
 	publishing_gallery3_session_deauthenticate (_tmp5_);
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 9089 "GalleryConnector.c"
+#line 9101 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
-	PublishingGallery3PublishingOptionsPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingGallery3PublishingOptionsPane* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingGallery3PublishingParameters* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	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"
@@ -9159,7 +9171,7 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub
 	if (!_tmp4_) {
 #line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		return;
-#line 9123 "GalleryConnector.c"
+#line 9135 "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" \
@@ -9170,11 +9182,11 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub
 	_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 9133 "GalleryConnector.c"
-		PublishingGallery3PublishingParameters* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		PublishingGallery3PublishingParameters* _tmp10_ = NULL;
+#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;
 #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9187,14 +9199,14 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub
 		_tmp10_ = parameters;
 #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		publishing_gallery3_gallery_publisher_do_create_album (self, _tmp10_);
-#line 9150 "GalleryConnector.c"
+#line 9162 "GalleryConnector.c"
 	} else {
-		PublishingGallery3PublishingParameters* _tmp11_ = NULL;
+		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 9157 "GalleryConnector.c"
+#line 9169 "GalleryConnector.c"
 	}
 }
 
@@ -9206,7 +9218,7 @@ static void publishing_gallery3_gallery_publisher_class_init (PublishingGallery3
 	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 9169 "GalleryConnector.c"
+#line 9181 "GalleryConnector.c"
 }
 
 
@@ -9214,14 +9226,14 @@ static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_inte
 #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"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_is_running;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_get_service;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_start;
+	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 9184 "GalleryConnector.c"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_stop;
+#line 9196 "GalleryConnector.c"
 }
 
 
@@ -9232,6 +9244,10 @@ static void publishing_gallery3_gallery_publisher_instance_init (PublishingGalle
 	self->priv->host = NULL;
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->progress_reporter = NULL;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+	self->priv->progress_reporter_target = self;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->service = NULL;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9248,11 +9264,11 @@ 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 9211 "GalleryConnector.c"
+#line 9227 "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);
@@ -9274,7 +9290,7 @@ 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 9237 "GalleryConnector.c"
+#line 9253 "GalleryConnector.c"
 }
 
 
@@ -9299,137 +9315,136 @@ static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** sel
 	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 9262 "GalleryConnector.c"
-		PublishingGallery3Album* _tmp0_ = NULL;
+#line 9278 "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 9268 "GalleryConnector.c"
+#line 9284 "GalleryConnector.c"
 	}
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 9272 "GalleryConnector.c"
+#line 9288 "GalleryConnector.c"
 }
 
 
 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 9279 "GalleryConnector.c"
+#line 9295 "GalleryConnector.c"
 }
 
 
 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 9286 "GalleryConnector.c"
+#line 9302 "GalleryConnector.c"
 }
 
 
 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 9293 "GalleryConnector.c"
+#line 9309 "GalleryConnector.c"
 }
 
 
 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 9300 "GalleryConnector.c"
+#line 9316 "GalleryConnector.c"
 }
 
 
 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 9307 "GalleryConnector.c"
+#line 9323 "GalleryConnector.c"
 }
 
 
 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 9314 "GalleryConnector.c"
+#line 9330 "GalleryConnector.c"
 }
 
 
 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 9321 "GalleryConnector.c"
+#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) {
 	PublishingGallery3PublishingOptionsPane * self = NULL;
-	PublishingGallery3Album** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingGallery3Album** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GtkBuilder* _tmp4_ = NULL;
-	GtkBuilder* _tmp5_ = NULL;
-	GtkBuilder* _tmp6_ = NULL;
-	GSList* _tmp7_ = NULL;
-	GSList* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkGrid* _tmp12_ = NULL;
-	GtkBuilder* _tmp13_ = NULL;
-	GObject* _tmp14_ = NULL;
-	GtkLabel* _tmp15_ = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkRadioButton* _tmp18_ = NULL;
-	GtkBuilder* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkComboBoxText* _tmp21_ = NULL;
-	GtkBuilder* _tmp22_ = NULL;
-	GObject* _tmp23_ = NULL;
-	GtkComboBoxText* _tmp24_ = NULL;
-	GtkBuilder* _tmp25_ = NULL;
-	GObject* _tmp26_ = NULL;
-	GtkEntry* _tmp27_ = NULL;
-	GtkBuilder* _tmp28_ = NULL;
-	GObject* _tmp29_ = NULL;
-	GtkRadioButton* _tmp30_ = NULL;
-	GtkBuilder* _tmp31_ = NULL;
-	GObject* _tmp32_ = NULL;
-	GtkEntry* _tmp33_ = NULL;
-	GtkBuilder* _tmp34_ = NULL;
-	GObject* _tmp35_ = NULL;
-	GtkCheckButton* _tmp36_ = NULL;
-	GtkBuilder* _tmp37_ = NULL;
-	GObject* _tmp38_ = NULL;
-	GtkButton* _tmp39_ = NULL;
-	GtkBuilder* _tmp40_ = NULL;
-	GObject* _tmp41_ = NULL;
-	GtkButton* _tmp42_ = NULL;
-	GtkLabel* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	const gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	GtkCheckButton* _tmp49_ = NULL;
-	gboolean _tmp50_ = FALSE;
-	GtkComboBoxText* _tmp51_ = NULL;
-	gint _tmp52_ = 0;
-	GtkEntry* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	GtkRadioButton* _tmp57_ = NULL;
-	GtkRadioButton* _tmp58_ = NULL;
-	GtkEntry* _tmp59_ = NULL;
-	GtkComboBoxText* _tmp60_ = NULL;
-	GtkEntry* _tmp61_ = NULL;
-	GtkButton* _tmp62_ = NULL;
-	GtkButton* _tmp63_ = 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_;
+	GObject* _tmp14_;
+	GtkLabel* _tmp15_;
+	GtkBuilder* _tmp16_;
+	GObject* _tmp17_;
+	GtkRadioButton* _tmp18_;
+	GtkBuilder* _tmp19_;
+	GObject* _tmp20_;
+	GtkComboBoxText* _tmp21_;
+	GtkBuilder* _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_;
 #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"
@@ -9597,99 +9612,97 @@ PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_
 #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_ = _ ("Publishing to %s as %s.");
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp45_ = url;
+	_tmp44_ = url;
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp46_ = username;
+	_tmp45_ = username;
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp47_ = g_strdup_printf (_tmp44_, _tmp45_, _tmp46_);
+	_tmp46_ = g_strdup_printf (_ ("Publishing to %s as %s."), _tmp44_, _tmp45_);
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp48_ = _tmp47_;
+	_tmp47_ = _tmp46_;
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_label_set_label (_tmp43_, _tmp48_);
+	gtk_label_set_label (_tmp43_, _tmp47_);
 #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp48_);
+	_g_free0 (_tmp47_);
 #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp49_ = self->priv->strip_metadata_check;
+	_tmp48_ = self->priv->strip_metadata_check;
 #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp50_ = strip_metadata;
+	_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 (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_);
+	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"
-	_tmp51_ = self->priv->scaling_combo;
+	_tmp50_ = self->priv->scaling_combo;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp52_ = scaling_id;
+	_tmp51_ = scaling_id;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), _tmp52_);
+	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"
-	_tmp53_ = self->priv->pixels;
+	_tmp52_ = self->priv->pixels;
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp54_ = scaling_pixels;
+	_tmp53_ = scaling_pixels;
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp55_ = g_strdup_printf ("%i", _tmp54_);
+	_tmp54_ = g_strdup_printf ("%i", _tmp53_);
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp56_ = _tmp55_;
+	_tmp55_ = _tmp54_;
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	gtk_entry_set_text (_tmp53_, _tmp56_);
+	gtk_entry_set_text (_tmp52_, _tmp55_);
 #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_free0 (_tmp56_);
+	_g_free0 (_tmp55_);
 #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp57_ = self->priv->use_existing_radio;
+	_tmp56_ = 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 (_tmp57_, 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 (_tmp56_, 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"
-	_tmp58_ = self->priv->create_new_radio;
+	_tmp57_ = 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 (_tmp58_, 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 (_tmp57_, 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"
-	_tmp59_ = self->priv->new_album_entry;
+	_tmp58_ = 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 (_tmp59_, 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 (_tmp58_, GTK_TYPE_EDITABLE, 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"
-	_tmp60_ = self->priv->scaling_combo;
+	_tmp59_ = 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 (_tmp60_, 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 (_tmp59_, 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"
-	_tmp61_ = self->priv->pixels;
+	_tmp60_ = self->priv->pixels;
 #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, 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 (_tmp60_, GTK_TYPE_EDITABLE, 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"
-	_tmp62_ = self->priv->logout_button;
+	_tmp61_ = self->priv->logout_button;
 #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp61_, "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"
-	_tmp63_ = self->priv->publish_button;
+	_tmp62_ = self->priv->publish_button;
 #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp62_, "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 9627 "GalleryConnector.c"
+#line 9640 "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) {
 #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 9634 "GalleryConnector.c"
+#line 9647 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self) {
 	gchar* album_name = NULL;
 	gint _tmp0_ = 0;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
 	gint photo_major_axis_size = 0;
 	PublishingGallery3PublishingParameters* param = NULL;
-	GtkRadioButton* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	PublishingGallery3PublishingParameters* _tmp34_ = NULL;
-	gint _tmp35_ = 0;
-	PublishingGallery3PublishingParameters* _tmp36_ = NULL;
-	GtkCheckButton* _tmp37_ = NULL;
-	gboolean _tmp38_ = FALSE;
-	PublishingGallery3PublishingParameters* _tmp39_ = NULL;
+	GtkRadioButton* _tmp6_;
+	gboolean _tmp7_;
+	PublishingGallery3PublishingParameters* _tmp34_;
+	gint _tmp35_;
+	PublishingGallery3PublishingParameters* _tmp36_;
+	GtkCheckButton* _tmp37_;
+	gboolean _tmp38_;
+	PublishingGallery3PublishingParameters* _tmp39_;
 #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"
@@ -9698,10 +9711,10 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ
 	_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 9661 "GalleryConnector.c"
-		GtkEntry* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
+#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;
 #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9710,11 +9723,11 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ
 		_tmp5_ = atoi (_tmp4_);
 #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = _tmp5_;
-#line 9673 "GalleryConnector.c"
+#line 9686 "GalleryConnector.c"
 	} else {
 #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = -1;
-#line 9677 "GalleryConnector.c"
+#line 9690 "GalleryConnector.c"
 	}
 #line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	photo_major_axis_size = _tmp0_;
@@ -9724,15 +9737,15 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ
 	_tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp7_) {
-#line 9687 "GalleryConnector.c"
-		GtkEntry* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		SpitPublishingPluginHost* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		PublishingGallery3PublishingParameters* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+#line 9700 "GalleryConnector.c"
+		GtkEntry* _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		SpitPublishingPluginHost* _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;
 #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9761,29 +9774,29 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ
 		_tmp15_ = 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 9724 "GalleryConnector.c"
+#line 9737 "GalleryConnector.c"
 	} else {
-		PublishingGallery3Album** _tmp16_ = NULL;
-		gint _tmp16__length1 = 0;
-		GtkComboBoxText* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		PublishingGallery3Album* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		SpitPublishingPluginHost* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
+		PublishingGallery3Album** _tmp16_;
+		gint _tmp16__length1;
+		GtkComboBoxText* _tmp17_;
+		gint _tmp18_;
+		PublishingGallery3Album* _tmp19_;
+		const gchar* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
+		SpitPublishingPluginHost* _tmp23_;
+		const gchar* _tmp24_;
 		gchar* album_path = NULL;
-		PublishingGallery3Album** _tmp25_ = NULL;
-		gint _tmp25__length1 = 0;
-		GtkComboBoxText* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		PublishingGallery3Album* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		PublishingGallery3PublishingParameters* _tmp33_ = 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;
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9838,7 +9851,7 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ
 		param = _tmp33_;
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_g_free0 (album_path);
-#line 9801 "GalleryConnector.c"
+#line 9814 "GalleryConnector.c"
 	}
 #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp34_ = param;
@@ -9857,19 +9870,19 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ
 #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp39_ = param;
 #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_emit_by_name (self, "publish", _tmp39_);
+	g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp39_);
 #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 9825 "GalleryConnector.c"
+#line 9838 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	GtkEntry* _tmp1_;
+	GtkComboBoxText* _tmp2_;
 #line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9886,14 +9899,14 @@ 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 9849 "GalleryConnector.c"
+#line 9862 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	GtkEntry* _tmp2_;
 #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9910,7 +9923,7 @@ 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 9873 "GalleryConnector.c"
+#line 9886 "GalleryConnector.c"
 }
 
 
@@ -9918,45 +9931,45 @@ static void publishing_gallery3_publishing_options_pane_on_logout_clicked (Publi
 #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_by_name (self, "logout");
-#line 9882 "GalleryConnector.c"
+	g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 9895 "GalleryConnector.c"
 }
 
 
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 9905 "GalleryConnector.c"
+#line 9918 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self) {
 	gchar* album_name = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GtkButton* _tmp10_ = NULL;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gboolean _tmp7_;
+	GtkButton* _tmp10_;
 #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"
@@ -9979,20 +9992,20 @@ 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 9942 "GalleryConnector.c"
-		GtkRadioButton* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+#line 9955 "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 9951 "GalleryConnector.c"
+#line 9964 "GalleryConnector.c"
 	} else {
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp3_ = FALSE;
-#line 9955 "GalleryConnector.c"
+#line 9968 "GalleryConnector.c"
 	}
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp10_ = self->priv->publish_button;
@@ -10000,7 +10013,7 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
 #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (album_name);
-#line 9963 "GalleryConnector.c"
+#line 9976 "GalleryConnector.c"
 }
 
 
@@ -10009,14 +10022,14 @@ static void publishing_gallery3_publishing_options_pane_on_new_album_entry_chang
 	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 9972 "GalleryConnector.c"
+#line 9985 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	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"
@@ -10027,7 +10040,7 @@ static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensi
 	_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 9990 "GalleryConnector.c"
+#line 10003 "GalleryConnector.c"
 }
 
 
@@ -10036,50 +10049,50 @@ static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_ch
 	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 9999 "GalleryConnector.c"
+#line 10012 "GalleryConnector.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 10022 "GalleryConnector.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10035 "GalleryConnector.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 10030 "GalleryConnector.c"
+#line 10043 "GalleryConnector.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 10042 "GalleryConnector.c"
+#line 10055 "GalleryConnector.c"
 	}
 }
 
@@ -10088,140 +10101,140 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 10066 "GalleryConnector.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10079 "GalleryConnector.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 10072 "GalleryConnector.c"
+#line 10085 "GalleryConnector.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 10076 "GalleryConnector.c"
+#line 10089 "GalleryConnector.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 10080 "GalleryConnector.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10093 "GalleryConnector.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 10092 "GalleryConnector.c"
+#line 10105 "GalleryConnector.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 10102 "GalleryConnector.c"
+#line 10115 "GalleryConnector.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 10108 "GalleryConnector.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 10122 "GalleryConnector.c"
+#line 10135 "GalleryConnector.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 10132 "GalleryConnector.c"
+#line 10145 "GalleryConnector.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 10138 "GalleryConnector.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 10151 "GalleryConnector.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 10147 "GalleryConnector.c"
+#line 10160 "GalleryConnector.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 10167 "GalleryConnector.c"
+#line 10180 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self) {
 	gchar* orig_text = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar last_char = '\0';
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gchar _tmp7_ = '\0';
-	const gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gchar _tmp7_;
+	const gchar* _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"
@@ -10252,23 +10265,23 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi
 	_tmp10_ = _tmp9_;
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (_tmp10_ > 0) {
-#line 10215 "GalleryConnector.c"
-		gchar _tmp11_ = '\0';
-		gboolean _tmp12_ = FALSE;
+#line 10228 "GalleryConnector.c"
+		gchar _tmp11_;
+		gboolean _tmp12_;
 #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp11_ = 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 10224 "GalleryConnector.c"
-			GtkEntry* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
+#line 10237 "GalleryConnector.c"
+			GtkEntry* _tmp13_;
+			const gchar* _tmp14_;
+			const gchar* _tmp15_;
+			gint _tmp16_;
+			gint _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp13_ = self->priv->pixels;
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10287,22 +10300,22 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi
 			gtk_entry_set_text (_tmp13_, _tmp19_);
 #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_g_free0 (_tmp19_);
-#line 10250 "GalleryConnector.c"
+#line 10263 "GalleryConnector.c"
 		}
 	}
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_g_free0 (orig_text);
-#line 10255 "GalleryConnector.c"
+#line 10268 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self) {
 	gint default_album_id = 0;
 	gchar* last_album = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	PublishingGallery3Album** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
+	PublishingGallery3Album** _tmp27_;
+	gint _tmp27__length1;
 #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10313,46 +10326,46 @@ 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 10276 "GalleryConnector.c"
+#line 10289 "GalleryConnector.c"
 	{
 		gint i = 0;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		i = 0;
-#line 10281 "GalleryConnector.c"
+#line 10294 "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 10288 "GalleryConnector.c"
-				gint _tmp4_ = 0;
-				PublishingGallery3Album** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				GtkComboBoxText* _tmp6_ = NULL;
-				PublishingGallery3Album** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				gint _tmp8_ = 0;
-				PublishingGallery3Album* _tmp9_ = NULL;
-				const gchar* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
+#line 10301 "GalleryConnector.c"
+				gint _tmp4_;
+				PublishingGallery3Album** _tmp5_;
+				gint _tmp5__length1;
+				GtkComboBoxText* _tmp6_;
+				PublishingGallery3Album** _tmp7_;
+				gint _tmp7__length1;
+				gint _tmp8_;
+				PublishingGallery3Album* _tmp9_;
+				const gchar* _tmp10_;
+				const gchar* _tmp11_;
 				gboolean _tmp12_ = FALSE;
-				PublishingGallery3Album** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				gint _tmp14_ = 0;
-				PublishingGallery3Album* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
+				PublishingGallery3Album** _tmp13_;
+				gint _tmp13__length1;
+				gint _tmp14_;
+				PublishingGallery3Album* _tmp15_;
+				const gchar* _tmp16_;
+				const gchar* _tmp17_;
+				const gchar* _tmp18_;
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (!_tmp2_) {
-#line 10309 "GalleryConnector.c"
-					gint _tmp3_ = 0;
+#line 10322 "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 10315 "GalleryConnector.c"
+#line 10328 "GalleryConnector.c"
 				}
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp2_ = FALSE;
@@ -10366,7 +10379,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 10329 "GalleryConnector.c"
+#line 10342 "GalleryConnector.c"
 				}
 #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				_tmp6_ = self->priv->existing_albums_combo;
@@ -10402,15 +10415,15 @@ 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 10365 "GalleryConnector.c"
+#line 10378 "GalleryConnector.c"
 				} else {
 					gboolean _tmp19_ = FALSE;
-					PublishingGallery3Album** _tmp20_ = NULL;
-					gint _tmp20__length1 = 0;
-					gint _tmp21_ = 0;
-					PublishingGallery3Album* _tmp22_ = NULL;
-					const gchar* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
+					PublishingGallery3Album** _tmp20_;
+					gint _tmp20__length1;
+					gint _tmp21_;
+					PublishingGallery3Album* _tmp22_;
+					const gchar* _tmp23_;
+					const gchar* _tmp24_;
 #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp20_ = self->priv->albums;
 #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10425,31 +10438,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 10388 "GalleryConnector.c"
-						gint _tmp25_ = 0;
+#line 10401 "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 10394 "GalleryConnector.c"
+#line 10407 "GalleryConnector.c"
 					} else {
 #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 						_tmp19_ = FALSE;
-#line 10398 "GalleryConnector.c"
+#line 10411 "GalleryConnector.c"
 					}
 #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 					_tmp12_ = _tmp19_;
-#line 10402 "GalleryConnector.c"
+#line 10415 "GalleryConnector.c"
 				}
 #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 				if (_tmp12_) {
-#line 10406 "GalleryConnector.c"
-					gint _tmp26_ = 0;
+#line 10419 "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 10412 "GalleryConnector.c"
+#line 10425 "GalleryConnector.c"
 				}
 			}
 		}
@@ -10460,12 +10473,12 @@ 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 10423 "GalleryConnector.c"
-		GtkComboBoxText* _tmp28_ = NULL;
-		GtkRadioButton* _tmp29_ = NULL;
-		GtkRadioButton* _tmp30_ = NULL;
-		GtkEntry* _tmp31_ = NULL;
-		GtkEntry* _tmp32_ = NULL;
+#line 10436 "GalleryConnector.c"
+		GtkComboBoxText* _tmp28_;
+		GtkRadioButton* _tmp29_;
+		GtkRadioButton* _tmp30_;
+		GtkEntry* _tmp31_;
+		GtkEntry* _tmp32_;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp28_ = self->priv->existing_albums_combo;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10486,18 +10499,18 @@ 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 10449 "GalleryConnector.c"
+#line 10462 "GalleryConnector.c"
 	} else {
-		gint _tmp33_ = 0;
+		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 10456 "GalleryConnector.c"
-			GtkRadioButton* _tmp34_ = NULL;
-			GtkComboBoxText* _tmp35_ = NULL;
-			gint _tmp36_ = 0;
-			GtkEntry* _tmp37_ = NULL;
+#line 10469 "GalleryConnector.c"
+			GtkRadioButton* _tmp34_;
+			GtkComboBoxText* _tmp35_;
+			gint _tmp36_;
+			GtkEntry* _tmp37_;
 #line 1661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp34_ = self->priv->use_existing_radio;
 #line 1661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10512,12 +10525,12 @@ 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 10475 "GalleryConnector.c"
+#line 10488 "GalleryConnector.c"
 		} else {
-			GtkRadioButton* _tmp38_ = NULL;
-			GtkComboBoxText* _tmp39_ = NULL;
-			GtkEntry* _tmp40_ = NULL;
-			GtkEntry* _tmp41_ = NULL;
+			GtkRadioButton* _tmp38_;
+			GtkComboBoxText* _tmp39_;
+			GtkEntry* _tmp40_;
+			GtkEntry* _tmp41_;
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp38_ = self->priv->create_new_radio;
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10534,7 +10547,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 10497 "GalleryConnector.c"
+#line 10510 "GalleryConnector.c"
 		}
 	}
 #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10543,15 +10556,15 @@ 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 10506 "GalleryConnector.c"
+#line 10519 "GalleryConnector.c"
 }
 
 
 static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingGallery3PublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkGrid* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkGrid* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 1675 "/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 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10562,7 +10575,7 @@ 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 10525 "GalleryConnector.c"
+#line 10538 "GalleryConnector.c"
 }
 
 
@@ -10575,7 +10588,7 @@ 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 10538 "GalleryConnector.c"
+#line 10551 "GalleryConnector.c"
 }
 
 
@@ -10585,7 +10598,7 @@ static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (
 	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 10548 "GalleryConnector.c"
+#line 10561 "GalleryConnector.c"
 }
 
 
@@ -10593,7 +10606,7 @@ static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled
 	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 10556 "GalleryConnector.c"
+#line 10569 "GalleryConnector.c"
 }
 
 
@@ -10612,19 +10625,19 @@ 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 10575 "GalleryConnector.c"
+#line 10588 "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 10581 "GalleryConnector.c"
+#line 10594 "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 10587 "GalleryConnector.c"
+#line 10600 "GalleryConnector.c"
 }
 
 
@@ -10636,10 +10649,10 @@ static void publishing_gallery3_publishing_options_pane_class_init (PublishingGa
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_publishing_options_pane_finalize;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	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);
+	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"
-	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 10602 "GalleryConnector.c"
+	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"
 }
 
 
@@ -10647,14 +10660,14 @@ static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_p
 #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"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_get_widget;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_get_preferred_geometry;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_on_pane_installed;
+	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 10617 "GalleryConnector.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled;
+#line 10630 "GalleryConnector.c"
 }
 
 
@@ -10685,11 +10698,11 @@ 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 10648 "GalleryConnector.c"
+#line 10661 "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);
@@ -10721,7 +10734,7 @@ 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 10684 "GalleryConnector.c"
+#line 10697 "GalleryConnector.c"
 }
 
 
@@ -10745,54 +10758,54 @@ static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_pa
 	self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type);
 #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 10708 "GalleryConnector.c"
+#line 10721 "GalleryConnector.c"
 }
 
 
 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 10715 "GalleryConnector.c"
+#line 10728 "GalleryConnector.c"
 }
 
 
 static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar _tmp3_;
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 10746 "GalleryConnector.c"
+#line 10759 "GalleryConnector.c"
 }
 
 
 PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title) {
 	PublishingGallery3PublishingParameters* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const 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"
@@ -10813,20 +10826,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameter
 	publishing_gallery3_publishing_parameters_set_album_title (self, _tmp3_);
 #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 10776 "GalleryConnector.c"
+#line 10789 "GalleryConnector.c"
 }
 
 
 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 10783 "GalleryConnector.c"
+#line 10796 "GalleryConnector.c"
 }
 
 
 PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path) {
 	PublishingGallery3PublishingParameters* self = NULL;
-	const gchar* _tmp0_ = 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"
@@ -10837,20 +10850,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameter
 	publishing_gallery3_publishing_parameters_set_album_path (self, _tmp0_);
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 10800 "GalleryConnector.c"
+#line 10813 "GalleryConnector.c"
 }
 
 
 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 10807 "GalleryConnector.c"
+#line 10820 "GalleryConnector.c"
 }
 
 
 gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), FALSE);
 #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10859,14 +10872,14 @@ 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 10822 "GalleryConnector.c"
+#line 10835 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self) {
 	const gchar* result;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
 #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"
@@ -10879,13 +10892,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_title (Publishi
 	result = _tmp1_;
 #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 10842 "GalleryConnector.c"
+#line 10855 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -10896,13 +10909,13 @@ static void publishing_gallery3_publishing_parameters_set_album_title (Publishin
 	_g_free0 (self->priv->_album_title);
 #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_album_title = _tmp1_;
-#line 10859 "GalleryConnector.c"
+#line 10872 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10911,13 +10924,13 @@ 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 10874 "GalleryConnector.c"
+#line 10887 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -10928,13 +10941,13 @@ static void publishing_gallery3_publishing_parameters_set_album_name (Publishing
 	_g_free0 (self->priv->_album_name);
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_album_name = _tmp1_;
-#line 10891 "GalleryConnector.c"
+#line 10904 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10943,13 +10956,13 @@ 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 10906 "GalleryConnector.c"
+#line 10919 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -10960,13 +10973,13 @@ void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery
 	_g_free0 (self->priv->_album_path);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_album_path = _tmp1_;
-#line 10923 "GalleryConnector.c"
+#line 10936 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10975,13 +10988,13 @@ 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 10938 "GalleryConnector.c"
+#line 10951 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -10992,13 +11005,13 @@ static void publishing_gallery3_publishing_parameters_set_entity_title (Publishi
 	_g_free0 (self->priv->_entity_title);
 #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_entity_title = _tmp1_;
-#line 10955 "GalleryConnector.c"
+#line 10968 "GalleryConnector.c"
 }
 
 
 gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), 0);
 #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11007,25 +11020,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 10970 "GalleryConnector.c"
+#line 10983 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #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 10982 "GalleryConnector.c"
+#line 10995 "GalleryConnector.c"
 }
 
 
 gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), FALSE);
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11034,26 +11047,26 @@ 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 10997 "GalleryConnector.c"
+#line 11010 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #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 11009 "GalleryConnector.c"
+#line 11022 "GalleryConnector.c"
 }
 
 
 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 11016 "GalleryConnector.c"
+#line 11029 "GalleryConnector.c"
 }
 
 
@@ -11062,7 +11075,7 @@ static void publishing_gallery3_value_publishing_parameters_free_value (GValue*
 	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 11025 "GalleryConnector.c"
+#line 11038 "GalleryConnector.c"
 	}
 }
 
@@ -11072,11 +11085,11 @@ static void publishing_gallery3_value_publishing_parameters_copy_value (const GV
 	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 11035 "GalleryConnector.c"
+#line 11048 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11039 "GalleryConnector.c"
+#line 11052 "GalleryConnector.c"
 	}
 }
 
@@ -11084,66 +11097,66 @@ static void publishing_gallery3_value_publishing_parameters_copy_value (const GV
 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 11047 "GalleryConnector.c"
+#line 11060 "GalleryConnector.c"
 }
 
 
 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 11054 "GalleryConnector.c"
-		PublishingGallery3PublishingParameters* object;
+#line 11067 "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 11061 "GalleryConnector.c"
+#line 11074 "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 11065 "GalleryConnector.c"
+#line 11078 "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 11069 "GalleryConnector.c"
+#line 11082 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 11073 "GalleryConnector.c"
+#line 11086 "GalleryConnector.c"
 	}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 11077 "GalleryConnector.c"
+#line 11090 "GalleryConnector.c"
 }
 
 
 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;
+	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 11088 "GalleryConnector.c"
+#line 11101 "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 11094 "GalleryConnector.c"
+#line 11107 "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 11098 "GalleryConnector.c"
+#line 11111 "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 11102 "GalleryConnector.c"
+#line 11115 "GalleryConnector.c"
 	}
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return NULL;
-#line 11106 "GalleryConnector.c"
+#line 11119 "GalleryConnector.c"
 }
 
 
@@ -11157,7 +11170,7 @@ 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 11120 "GalleryConnector.c"
+#line 11133 "GalleryConnector.c"
 }
 
 
@@ -11166,12 +11179,12 @@ gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* valu
 	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 11129 "GalleryConnector.c"
+#line 11142 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingGallery3PublishingParameters* old;
+	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));
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11186,23 +11199,23 @@ 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 11149 "GalleryConnector.c"
+#line 11162 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 11153 "GalleryConnector.c"
+#line 11166 "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 11159 "GalleryConnector.c"
+#line 11172 "GalleryConnector.c"
 	}
 }
 
 
 void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingGallery3PublishingParameters* old;
+	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));
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11215,17 +11228,17 @@ 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 11178 "GalleryConnector.c"
+#line 11191 "GalleryConnector.c"
 	} else {
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		value->data[0].v_pointer = NULL;
-#line 11182 "GalleryConnector.c"
+#line 11195 "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 11188 "GalleryConnector.c"
+#line 11201 "GalleryConnector.c"
 	}
 }
 
@@ -11237,15 +11250,15 @@ static void publishing_gallery3_publishing_parameters_class_init (PublishingGall
 	((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 11200 "GalleryConnector.c"
+#line 11213 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv = PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
 #line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11270,11 +11283,11 @@ 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 11233 "GalleryConnector.c"
+#line 11246 "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);
@@ -11288,7 +11301,7 @@ 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 11251 "GalleryConnector.c"
+#line 11264 "GalleryConnector.c"
 }
 
 
@@ -11307,18 +11320,18 @@ GType publishing_gallery3_publishing_parameters_get_type (void) {
 
 
 gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance) {
-	PublishingGallery3PublishingParameters* self;
+	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 11276 "GalleryConnector.c"
+#line 11289 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_publishing_parameters_unref (gpointer instance) {
-	PublishingGallery3PublishingParameters* self;
+	PublishingGallery3PublishingParameters * self;
 	self = instance;
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -11326,7 +11339,7 @@ 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 11289 "GalleryConnector.c"
+#line 11302 "GalleryConnector.c"
 	}
 }
 
@@ -11337,49 +11350,49 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr
 	switch (self) {
 #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO:
-#line 11300 "GalleryConnector.c"
+#line 11313 "GalleryConnector.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp0_ = g_strdup ("INTRO");
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			result = _tmp0_;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return result;
-#line 11309 "GalleryConnector.c"
+#line 11322 "GalleryConnector.c"
 		}
 #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY:
-#line 11313 "GalleryConnector.c"
+#line 11326 "GalleryConnector.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp1_ = g_strdup ("FAILED_RETRY");
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			result = _tmp1_;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return result;
-#line 11322 "GalleryConnector.c"
+#line 11335 "GalleryConnector.c"
 		}
 #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL:
-#line 11326 "GalleryConnector.c"
+#line 11339 "GalleryConnector.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp2_ = g_strdup ("NOT_GALLERY_URL");
 #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			result = _tmp2_;
 #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			return result;
-#line 11335 "GalleryConnector.c"
+#line 11348 "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 11341 "GalleryConnector.c"
+#line 11354 "GalleryConnector.c"
 		}
 	}
 }
@@ -11400,18 +11413,18 @@ 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 * self = NULL;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	PublishingGallery3CredentialsPaneMode _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkBuilder* _tmp15_ = NULL;
-	PublishingGallery3CredentialsGrid* _tmp16_ = NULL;
-	PublishingGallery3CredentialsGrid* _tmp17_ = NULL;
-	GtkGrid* _tmp18_ = NULL;
-	GtkGrid* _tmp19_ = NULL;
-	GtkWidget* _tmp20_ = 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_;
 	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);
@@ -11421,16 +11434,16 @@ 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 11383 "GalleryConnector.c"
+#line 11396 "GalleryConnector.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
+		GtkBuilder* _tmp1_;
 #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = builder;
 #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		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 11392 "GalleryConnector.c"
+#line 11405 "GalleryConnector.c"
 			goto __catch15_g_error;
 		}
 	}
@@ -11438,14 +11451,13 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 	__catch15_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
+		SpitPublishingPluginHost* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _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"
@@ -11459,29 +11471,27 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = host;
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \
-"continue.");
-#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME);
+		_tmp5_ = 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"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_);
+		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp9_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_error_free0 (_tmp9_);
+		_g_error_free0 (_tmp8_);
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #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 11442 "GalleryConnector.c"
+#line 11452 "GalleryConnector.c"
 	}
 	__finally15:
 #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11494,50 +11504,50 @@ 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 11455 "GalleryConnector.c"
+#line 11465 "GalleryConnector.c"
 	}
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp10_ = host;
+	_tmp9_ = host;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp11_ = mode;
+	_tmp10_ = mode;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp12_ = url;
+	_tmp11_ = url;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp13_ = username;
+	_tmp12_ = username;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp14_ = key;
+	_tmp13_ = key;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp15_ = builder;
+	_tmp14_ = builder;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp16_ = publishing_gallery3_credentials_grid_new (_tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_);
+	_tmp15_ = publishing_gallery3_credentials_grid_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
 #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 = _tmp16_;
+	self->priv->frame = _tmp15_;
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp17_ = self->priv->frame;
+	_tmp16_ = self->priv->frame;
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp18_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp17_);
+	_tmp17_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp16_);
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp19_ = _tmp18_;
+	_tmp18_ = _tmp17_;
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp19_) : NULL);
+	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp18_) : 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 = _tmp20_;
+	self->priv->grid_widget = _tmp19_;
 #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 11491 "GalleryConnector.c"
+#line 11501 "GalleryConnector.c"
 }
 
 
 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 11498 "GalleryConnector.c"
+#line 11508 "GalleryConnector.c"
 }
 
 
@@ -11545,16 +11555,16 @@ void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3Cred
 #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_by_name (self, "go-back");
-#line 11507 "GalleryConnector.c"
+	g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL], 0);
+#line 11517 "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_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 #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"
@@ -11574,17 +11584,17 @@ void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3Creden
 #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_by_name (self, "login", _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 11536 "GalleryConnector.c"
+	g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
+#line 11546 "GalleryConnector.c"
 }
 
 
 static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingGallery3CredentialsPane * self;
 	GtkWidget* result = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
+	GtkWidget* _tmp2_;
 #line 1794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane);
 #line 1795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11599,7 +11609,7 @@ 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 11560 "GalleryConnector.c"
+#line 11570 "GalleryConnector.c"
 }
 
 
@@ -11612,29 +11622,29 @@ 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 11573 "GalleryConnector.c"
+#line 11583 "GalleryConnector.c"
 }
 
 
 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 11580 "GalleryConnector.c"
+#line 11590 "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) {
 #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 11587 "GalleryConnector.c"
+#line 11597 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingGallery3CredentialsPane * self;
-	PublishingGallery3CredentialsGrid* _tmp0_ = NULL;
-	PublishingGallery3CredentialsGrid* _tmp1_ = NULL;
-	PublishingGallery3CredentialsGrid* _tmp2_ = NULL;
+	PublishingGallery3CredentialsGrid* _tmp0_;
+	PublishingGallery3CredentialsGrid* _tmp1_;
+	PublishingGallery3CredentialsGrid* _tmp2_;
 #line 1803 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane);
 #line 1804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11649,16 +11659,16 @@ 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 11610 "GalleryConnector.c"
+#line 11620 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingGallery3CredentialsPane * self;
-	PublishingGallery3CredentialsGrid* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingGallery3CredentialsGrid* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingGallery3CredentialsGrid* _tmp0_;
+	guint _tmp1_;
+	PublishingGallery3CredentialsGrid* _tmp2_;
+	guint _tmp3_;
 #line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane);
 #line 1811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11673,7 +11683,7 @@ 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 11634 "GalleryConnector.c"
+#line 11644 "GalleryConnector.c"
 }
 
 
@@ -11692,19 +11702,19 @@ 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 11653 "GalleryConnector.c"
+#line 11663 "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 11659 "GalleryConnector.c"
+#line 11669 "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 11665 "GalleryConnector.c"
+#line 11675 "GalleryConnector.c"
 }
 
 
@@ -11716,10 +11726,10 @@ static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3C
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_credentials_pane_finalize;
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	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);
+	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"
-	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 11680 "GalleryConnector.c"
+	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"
 }
 
 
@@ -11727,14 +11737,14 @@ static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_int
 #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"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_get_widget;
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_get_preferred_geometry;
 #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_on_pane_installed;
+	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 11695 "GalleryConnector.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_uninstalled;
+#line 11705 "GalleryConnector.c"
 }
 
 
@@ -11745,11 +11755,11 @@ static void publishing_gallery3_credentials_pane_instance_init (PublishingGaller
 	self->priv->frame = NULL;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->grid_widget = NULL;
-#line 11706 "GalleryConnector.c"
+#line 11716 "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);
@@ -11759,7 +11769,7 @@ 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 11720 "GalleryConnector.c"
+#line 11730 "GalleryConnector.c"
 }
 
 
@@ -11780,75 +11790,75 @@ 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) {
 #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	publishing_gallery3_credentials_grid_on_url_or_username_changed ((PublishingGallery3CredentialsGrid*) self);
-#line 11741 "GalleryConnector.c"
+#line 11751 "GalleryConnector.c"
 }
 
 
 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 11748 "GalleryConnector.c"
+#line 11758 "GalleryConnector.c"
 }
 
 
 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 11755 "GalleryConnector.c"
+#line 11765 "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 * self = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GtkBuilder* _tmp7_ = NULL;
-	GtkBuilder* _tmp8_ = NULL;
-	GtkBuilder* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	GSList* _tmp11_ = NULL;
-	GSList* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	GtkBuilder* _tmp14_ = NULL;
-	GObject* _tmp15_ = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkLabel* _tmp18_ = NULL;
-	GtkBuilder* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkEntry* _tmp21_ = NULL;
-	GtkBuilder* _tmp22_ = NULL;
-	GObject* _tmp23_ = NULL;
-	GtkEntry* _tmp24_ = NULL;
-	GtkBuilder* _tmp25_ = NULL;
-	GObject* _tmp26_ = NULL;
-	GtkEntry* _tmp27_ = NULL;
-	GtkBuilder* _tmp28_ = NULL;
-	GObject* _tmp29_ = NULL;
-	GtkEntry* _tmp30_ = NULL;
-	GtkBuilder* _tmp31_ = NULL;
-	GObject* _tmp32_ = NULL;
-	GtkButton* _tmp33_ = NULL;
-	GtkBuilder* _tmp34_ = NULL;
-	GObject* _tmp35_ = NULL;
-	GtkButton* _tmp36_ = NULL;
-	PublishingGallery3CredentialsPaneMode _tmp37_ = 0;
-	const gchar* _tmp47_ = NULL;
-	GtkEntry* _tmp51_ = NULL;
-	const gchar* _tmp52_ = NULL;
-	GtkEntry* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	GtkEntry* _tmp61_ = NULL;
-	GtkButton* _tmp62_ = NULL;
-	GtkButton* _tmp63_ = NULL;
-	gboolean _tmp64_ = FALSE;
-	const gchar* _tmp65_ = NULL;
-	GtkButton* _tmp67_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const 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_;
+	GObject* _tmp15_;
+	GtkBuilder* _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_;
+	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_;
 #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"
@@ -11989,194 +11999,188 @@ PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construc
 	switch (_tmp37_) {
 #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO:
-#line 11950 "GalleryConnector.c"
+#line 11960 "GalleryConnector.c"
 		{
-			GtkLabel* _tmp38_ = NULL;
+			GtkLabel* _tmp38_;
 #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp38_ = 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);
 #line 1868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			break;
-#line 11959 "GalleryConnector.c"
+#line 11969 "GalleryConnector.c"
 		}
 #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY:
-#line 11963 "GalleryConnector.c"
+#line 11973 "GalleryConnector.c"
 		{
-			GtkLabel* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			gchar* _tmp41_ = NULL;
-			gchar* _tmp42_ = NULL;
+			GtkLabel* _tmp39_;
+			gchar* _tmp40_;
+			gchar* _tmp41_;
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			_tmp39_ = self->priv->intro_message_label;
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp40_ = _ ("Unrecognized User");
+			_tmp40_ = 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_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp40_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE);
+			_tmp41_ = _tmp40_;
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp42_ = _tmp41_;
+			gtk_label_set_markup (_tmp39_, _tmp41_);
 #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			gtk_label_set_markup (_tmp39_, _tmp42_);
-#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_g_free0 (_tmp42_);
+			_g_free0 (_tmp41_);
 #line 1873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			break;
-#line 11983 "GalleryConnector.c"
+#line 11990 "GalleryConnector.c"
 		}
 #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL:
-#line 11987 "GalleryConnector.c"
+#line 11994 "GalleryConnector.c"
 		{
-			GtkLabel* _tmp43_ = NULL;
-			const gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
-			gchar* _tmp46_ = NULL;
-#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp43_ = self->priv->intro_message_label;
+			GtkLabel* _tmp42_;
+			gchar* _tmp43_;
+			gchar* _tmp44_;
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp44_ = _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found");
+			_tmp42_ = self->priv->intro_message_label;
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp45_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp44_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE);
+			_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);
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_tmp46_ = _tmp45_;
+			_tmp44_ = _tmp43_;
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			gtk_label_set_markup (_tmp43_, _tmp46_);
+			gtk_label_set_markup (_tmp42_, _tmp44_);
 #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-			_g_free0 (_tmp46_);
+			_g_free0 (_tmp44_);
 #line 1879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			break;
-#line 12007 "GalleryConnector.c"
+#line 12011 "GalleryConnector.c"
 		}
 		default:
 		{
 #line 1882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 			g_error ("GalleryConnector.vala:1882: Invalid CredentialsPane mode");
-#line 12013 "GalleryConnector.c"
+#line 12017 "GalleryConnector.c"
 		}
 	}
 #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp47_ = url;
+	_tmp45_ = url;
 #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp47_ != NULL) {
-#line 12020 "GalleryConnector.c"
-		GtkEntry* _tmp48_ = NULL;
-		const gchar* _tmp49_ = NULL;
-		GtkEntry* _tmp50_ = NULL;
+	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"
-		_tmp48_ = self->priv->url_entry;
+		_tmp46_ = self->priv->url_entry;
 #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp49_ = url;
+		_tmp47_ = url;
 #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_entry_set_text (_tmp48_, _tmp49_);
+		gtk_entry_set_text (_tmp46_, _tmp47_);
 #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp50_ = self->priv->username_entry;
+		_tmp48_ = 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 (_tmp50_, gtk_widget_get_type (), GtkWidget));
-#line 12034 "GalleryConnector.c"
+		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
+#line 12038 "GalleryConnector.c"
 	}
 #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp51_ = self->priv->url_entry;
+	_tmp49_ = 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 (_tmp51_, 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 (_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"
-	_tmp52_ = username;
+	_tmp50_ = username;
 #line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp52_ != NULL) {
-#line 12044 "GalleryConnector.c"
-		GtkEntry* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
-		GtkEntry* _tmp55_ = NULL;
+	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"
-		_tmp53_ = self->priv->username_entry;
+		_tmp51_ = self->priv->username_entry;
 #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp54_ = username;
+		_tmp52_ = username;
 #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_entry_set_text (_tmp53_, _tmp54_);
+		gtk_entry_set_text (_tmp51_, _tmp52_);
 #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp55_ = self->priv->password_entry;
+		_tmp53_ = 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 (_tmp55_, gtk_widget_get_type (), GtkWidget));
-#line 12058 "GalleryConnector.c"
+		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
+#line 12062 "GalleryConnector.c"
 	}
 #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp56_ = self->priv->username_entry;
+	_tmp54_ = 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 (_tmp56_, 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 (_tmp54_, GTK_TYPE_EDITABLE, 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"
-	_tmp57_ = key;
+	_tmp55_ = key;
 #line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp57_ != NULL) {
-#line 12068 "GalleryConnector.c"
-		GtkEntry* _tmp58_ = NULL;
-		const gchar* _tmp59_ = NULL;
-		GtkEntry* _tmp60_ = NULL;
+	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"
-		_tmp58_ = self->priv->key_entry;
+		_tmp56_ = self->priv->key_entry;
 #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp59_ = key;
+		_tmp57_ = key;
 #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		gtk_entry_set_text (_tmp58_, _tmp59_);
+		gtk_entry_set_text (_tmp56_, _tmp57_);
 #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp60_ = self->priv->key_entry;
+		_tmp58_ = 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 (_tmp60_, gtk_widget_get_type (), GtkWidget));
-#line 12082 "GalleryConnector.c"
+		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+#line 12086 "GalleryConnector.c"
 	}
 #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp61_ = self->priv->key_entry;
+	_tmp59_ = 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 (_tmp61_, 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 (_tmp59_, GTK_TYPE_EDITABLE, 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"
-	_tmp62_ = self->priv->go_back_button;
+	_tmp60_ = self->priv->go_back_button;
 #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp60_, "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"
-	_tmp63_ = self->priv->login_button;
+	_tmp61_ = self->priv->login_button;
 #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp61_, "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"
-	_tmp65_ = url;
+	_tmp63_ = url;
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	if (_tmp65_ != NULL) {
-#line 12100 "GalleryConnector.c"
-		const gchar* _tmp66_ = NULL;
+	if (_tmp63_ != NULL) {
+#line 12104 "GalleryConnector.c"
+		const gchar* _tmp64_;
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp66_ = username;
+		_tmp64_ = username;
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp64_ = _tmp66_ != NULL;
-#line 12106 "GalleryConnector.c"
+		_tmp62_ = _tmp64_ != NULL;
+#line 12110 "GalleryConnector.c"
 	} else {
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp64_ = FALSE;
-#line 12110 "GalleryConnector.c"
+		_tmp62_ = FALSE;
+#line 12114 "GalleryConnector.c"
 	}
 #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp67_ = self->priv->login_button;
+	_tmp65_ = 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 (_tmp67_, gtk_widget_get_type (), GtkWidget), _tmp64_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp62_);
 #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 12118 "GalleryConnector.c"
+#line 12122 "GalleryConnector.c"
 }
 
 
 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 12125 "GalleryConnector.c"
+#line 12129 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkEntry* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkEntry* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	GtkEntry* _tmp2_;
+	const gchar* _tmp3_;
+	GtkEntry* _tmp4_;
+	const gchar* _tmp5_;
+	GtkEntry* _tmp6_;
+	const gchar* _tmp7_;
 #line 1911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self));
 #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12196,8 +12200,8 @@ static void publishing_gallery3_credentials_grid_on_login_button_clicked (Publis
 #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp7_ = gtk_entry_get_text (_tmp6_);
 #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 12158 "GalleryConnector.c"
+	g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_);
+#line 12162 "GalleryConnector.c"
 }
 
 
@@ -12205,17 +12209,17 @@ static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (Publ
 #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_by_name (self, "go-back");
-#line 12167 "GalleryConnector.c"
+	g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL], 0);
+#line 12171 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GtkEntry* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkButton* _tmp8_ = NULL;
+	GtkEntry* _tmp2_;
+	const gchar* _tmp3_;
+	GtkButton* _tmp8_;
 #line 1920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self));
 #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12224,49 +12228,49 @@ 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 12185 "GalleryConnector.c"
-		GtkEntry* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+#line 12189 "GalleryConnector.c"
+		GtkEntry* _tmp4_;
+		const gchar* _tmp5_;
 #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = self->priv->username_entry;
 #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp5_ = gtk_entry_get_text (_tmp4_);
 #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 12194 "GalleryConnector.c"
+#line 12198 "GalleryConnector.c"
 	} else {
 #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp1_ = FALSE;
-#line 12198 "GalleryConnector.c"
+#line 12202 "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 12204 "GalleryConnector.c"
+#line 12208 "GalleryConnector.c"
 	} else {
-		GtkEntry* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		GtkEntry* _tmp6_;
+		const gchar* _tmp7_;
 #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp6_ = self->priv->key_entry;
 #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp7_ = gtk_entry_get_text (_tmp6_);
 #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp0_ = g_strcmp0 (_tmp7_, "") != 0;
-#line 12214 "GalleryConnector.c"
+#line 12218 "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 12220 "GalleryConnector.c"
+#line 12224 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	GtkButton* _tmp2_;
 #line 1927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self));
 #line 1928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12279,13 +12283,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 12240 "GalleryConnector.c"
+#line 12244 "GalleryConnector.c"
 }
 
 
 GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self) {
 	GtkGrid* result;
-	GtkGrid* _tmp0_ = NULL;
+	GtkGrid* _tmp0_;
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self), NULL);
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12294,26 +12298,30 @@ 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 12255 "GalleryConnector.c"
+#line 12259 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value) {
-	GtkGrid* _tmp0_ = NULL;
-	GtkGrid* _tmp1_ = NULL;
 #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"
-	_tmp0_ = value;
+	if (publishing_gallery3_credentials_grid_get_pane_widget (self) != value) {
+#line 12268 "GalleryConnector.c"
+		GtkGrid* _tmp0_;
+		GtkGrid* _tmp1_;
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	_g_object_unref0 (self->priv->_pane_widget);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	self->priv->_pane_widget = _tmp1_;
+		_g_object_unref0 (self->priv->_pane_widget);
 #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	g_object_notify ((GObject *) self, "pane-widget");
-#line 12274 "GalleryConnector.c"
+		self->priv->_pane_widget = _tmp1_;
+#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+		g_object_notify ((GObject *) self, "pane-widget");
+#line 12281 "GalleryConnector.c"
+	}
 }
 
 
@@ -12329,12 +12337,12 @@ 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, 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, 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));
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-	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);
+	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"
-	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 12295 "GalleryConnector.c"
+	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"
 }
 
 
@@ -12367,11 +12375,11 @@ 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 12328 "GalleryConnector.c"
+#line 12336 "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);
@@ -12401,7 +12409,7 @@ 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 12362 "GalleryConnector.c"
+#line 12370 "GalleryConnector.c"
 }
 
 
@@ -12423,18 +12431,18 @@ static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * o
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	switch (property_id) {
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET:
+		case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY:
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		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 12389 "GalleryConnector.c"
+#line 12397 "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 12395 "GalleryConnector.c"
+#line 12403 "GalleryConnector.c"
 	}
 }
 
@@ -12445,18 +12453,18 @@ static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * o
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	switch (property_id) {
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET:
+		case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY:
 #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		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 12411 "GalleryConnector.c"
+#line 12419 "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 12417 "GalleryConnector.c"
+#line 12425 "GalleryConnector.c"
 	}
 }
 
@@ -12467,21 +12475,21 @@ PublishingGallery3Session* publishing_gallery3_session_construct (GType object_t
 	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 12428 "GalleryConnector.c"
+#line 12436 "GalleryConnector.c"
 }
 
 
 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 12435 "GalleryConnector.c"
+#line 12443 "GalleryConnector.c"
 }
 
 
 static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base) {
 	PublishingGallery3Session * self;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1945 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
 #line 1946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12490,14 +12498,14 @@ 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 12451 "GalleryConnector.c"
+#line 12459 "GalleryConnector.c"
 }
 
 
 void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 #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"
@@ -12520,7 +12528,7 @@ void publishing_gallery3_session_authenticate (PublishingGallery3Session* self,
 	publishing_gallery3_session_set_key (self, _tmp2_);
 #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 12481 "GalleryConnector.c"
+#line 12489 "GalleryConnector.c"
 }
 
 
@@ -12533,13 +12541,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 12494 "GalleryConnector.c"
+#line 12502 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL);
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12548,13 +12556,13 @@ 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 12509 "GalleryConnector.c"
+#line 12517 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -12565,13 +12573,13 @@ static void publishing_gallery3_session_set_url (PublishingGallery3Session* self
 	_g_free0 (self->priv->_url);
 #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_url = _tmp1_;
-#line 12526 "GalleryConnector.c"
+#line 12534 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL);
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12580,13 +12588,13 @@ 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 12541 "GalleryConnector.c"
+#line 12549 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -12597,13 +12605,13 @@ static void publishing_gallery3_session_set_username (PublishingGallery3Session*
 	_g_free0 (self->priv->_username);
 #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_username = _tmp1_;
-#line 12558 "GalleryConnector.c"
+#line 12566 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL);
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12612,13 +12620,13 @@ 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 12573 "GalleryConnector.c"
+#line 12581 "GalleryConnector.c"
 }
 
 
 static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -12629,7 +12637,7 @@ static void publishing_gallery3_session_set_key (PublishingGallery3Session* self
 	_g_free0 (self->priv->_key);
 #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	self->priv->_key = _tmp1_;
-#line 12590 "GalleryConnector.c"
+#line 12598 "GalleryConnector.c"
 }
 
 
@@ -12641,8 +12649,8 @@ static void publishing_gallery3_session_class_init (PublishingGallery3SessionCla
 #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	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 12603 "GalleryConnector.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_gallery3_session_real_is_authenticated;
+#line 12611 "GalleryConnector.c"
 }
 
 
@@ -12655,11 +12663,11 @@ 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 12616 "GalleryConnector.c"
+#line 12624 "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);
@@ -12671,7 +12679,7 @@ 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 12632 "GalleryConnector.c"
+#line 12640 "GalleryConnector.c"
 }
 
 
@@ -12689,11 +12697,11 @@ 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* self = NULL;
-	PublishingGallery3Session* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingGallery3PublishingParameters* _tmp2_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp3_ = NULL;
+	PublishingGallery3Session* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingGallery3PublishingParameters* _tmp2_;
+	PublishingGallery3PublishingParameters* _tmp3_;
 #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"
@@ -12716,21 +12724,21 @@ PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object
 	self->priv->parameters = _tmp3_;
 #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return self;
-#line 12677 "GalleryConnector.c"
+#line 12685 "GalleryConnector.c"
 }
 
 
 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 12684 "GalleryConnector.c"
+#line 12692 "GalleryConnector.c"
 }
 
 
 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 12691 "GalleryConnector.c"
+#line 12699 "GalleryConnector.c"
 }
 
 
@@ -12738,15 +12746,15 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat
 	PublishingGallery3Uploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	SpitPublishingPublishable* p = NULL;
-	SpitPublishingPublishable* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	SpitPublishingPublisherMediaType _tmp2_ = 0;
-	PublishingRESTSupportSession* _tmp3_ = NULL;
-	PublishingGallery3Session* _tmp4_ = NULL;
-	PublishingGallery3PublishingParameters* _tmp5_ = NULL;
-	PublishingGallery3GalleryUploadTransaction* _tmp6_ = NULL;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
+	SpitPublishingPublishable* _tmp0_;
+	gchar* _tmp1_;
+	SpitPublishingPublisherMediaType _tmp2_;
+	PublishingRESTSupportSession* _tmp3_;
+	PublishingGallery3Session* _tmp4_;
+	PublishingGallery3PublishingParameters* _tmp5_;
+	PublishingGallery3GalleryUploadTransaction* _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"
@@ -12789,13 +12797,13 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat
 	_g_object_unref0 (p);
 #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12750 "GalleryConnector.c"
+#line 12758 "GalleryConnector.c"
 }
 
 
 const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), NULL);
 #line 1975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12804,14 +12812,14 @@ 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 12765 "GalleryConnector.c"
+#line 12773 "GalleryConnector.c"
 }
 
 
 guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self) {
 	guint result;
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	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"
@@ -12822,13 +12830,13 @@ guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader*
 	result = _tmp1_;
 #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12783 "GalleryConnector.c"
+#line 12791 "GalleryConnector.c"
 }
 
 
 SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self) {
 	SpitPublishingPublisherMediaType result;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	SpitPublishingPublisherMediaType _tmp0_;
 #line 1985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), 0);
 #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12837,7 +12845,7 @@ SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publis
 	result = _tmp0_;
 #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12798 "GalleryConnector.c"
+#line 12806 "GalleryConnector.c"
 }
 
 
@@ -12849,19 +12857,19 @@ static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderC
 #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	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 12811 "GalleryConnector.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction;
+#line 12819 "GalleryConnector.c"
 }
 
 
 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 12818 "GalleryConnector.c"
+#line 12826 "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);
@@ -12873,7 +12881,7 @@ 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 12834 "GalleryConnector.c"
+#line 12842 "GalleryConnector.c"
 }
 
 
@@ -12892,55 +12900,55 @@ GType publishing_gallery3_uploader_get_type (void) {
 static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 12873 "GalleryConnector.c"
-		gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12881 "GalleryConnector.c"
+		gchar* _tmp4_;
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 12881 "GalleryConnector.c"
+#line 12889 "GalleryConnector.c"
 	} else {
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 12887 "GalleryConnector.c"
+#line 12895 "GalleryConnector.c"
 	}
 }
 
 
 gchar* publishing_gallery3_strip_session_url (const gchar* url) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gint item_loc = 0;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
+	const gchar* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gchar* _tmp7_;
 #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"
@@ -12955,13 +12963,13 @@ gchar* publishing_gallery3_strip_session_url (const gchar* url) {
 	item_loc = _tmp2_;
 #line 2025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	if (-1 == item_loc) {
-#line 12916 "GalleryConnector.c"
-		const gchar* _tmp3_ = NULL;
+#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 12922 "GalleryConnector.c"
+#line 12930 "GalleryConnector.c"
 	}
 #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	_tmp4_ = url;
@@ -12975,7 +12983,7 @@ gchar* publishing_gallery3_strip_session_url (const gchar* url) {
 	result = _tmp7_;
 #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 	return result;
-#line 12936 "GalleryConnector.c"
+#line 12944 "GalleryConnector.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c
index 475b3d2..c63d685 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.34.7, the Vala compiler
+/* RajcePublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from RajcePublishing.vala, do not modify */
 
 /* Copyright 2014 rajce.net
@@ -203,7 +203,18 @@ typedef struct _PublishingRajceUploaderPrivate PublishingRajceUploaderPrivate;
 typedef struct _PublishingRajceAddPhotoTransaction PublishingRajceAddPhotoTransaction;
 typedef struct _PublishingRajceAddPhotoTransactionClass PublishingRajceAddPhotoTransactionClass;
 typedef struct _PublishingRajceAuthenticationPanePrivate PublishingRajceAuthenticationPanePrivate;
+enum  {
+	PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL,
+	PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL
+};
+static guint publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingRajcePublishingOptionsPanePrivate PublishingRajcePublishingOptionsPanePrivate;
+enum  {
+	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingRajceParamSpecPublishingParameters PublishingRajceParamSpecPublishingParameters;
 typedef struct _PublishingRajceSessionPrivate PublishingRajceSessionPrivate;
 
@@ -552,10 +563,10 @@ static gint rajce_service_icon_pixbuf_set_length1;
 static GdkPixbuf** rajce_service_icon_pixbuf_set = NULL;
 static gint rajce_service_icon_pixbuf_set_length1 = 0;
 static gint _rajce_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* rajce_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* rajce_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * rajce_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * rajce_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_rajce_rajce_publisher_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_rajce_rajce_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_rajce_rajce_publisher_spit_publishing_publisher_parent_iface = NULL;
 static gpointer publishing_rajce_album_parent_class = NULL;
 static gpointer publishing_rajce_uploader_parent_class = NULL;
 static gpointer publishing_rajce_authentication_pane_parent_class = NULL;
@@ -563,9 +574,9 @@ static gchar* publishing_rajce_authentication_pane_INTRO_MESSAGE;
 static gchar* publishing_rajce_authentication_pane_INTRO_MESSAGE = NULL;
 static gchar* publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 static gchar* publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL;
-static SpitPublishingDialogPaneIface* publishing_rajce_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_rajce_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_rajce_publishing_options_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_rajce_publishing_parameters_parent_class = NULL;
 static gpointer publishing_rajce_session_parent_class = NULL;
 static gpointer publishing_rajce_arg_item_parent_class = NULL;
@@ -598,7 +609,7 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType
 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_finalize (GObject* obj);
+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);
@@ -685,7 +696,7 @@ static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish
 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);
@@ -734,11 +745,11 @@ static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing
 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_finalize (GObject* obj);
+static void publishing_rajce_rajce_publisher_finalize (GObject * obj);
 enum  {
 	PUBLISHING_RAJCE_ALBUM_DUMMY_PROPERTY
 };
-static void publishing_rajce_album_finalize (PublishingRajceAlbum* obj);
+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
@@ -747,7 +758,7 @@ static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_t
 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);
+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
@@ -764,7 +775,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_p
 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 publishing_rajce_authentication_pane_finalize (GObject* obj);
+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
@@ -795,13 +806,13 @@ static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_
 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 publishing_rajce_publishing_options_pane_finalize (GObject* obj);
+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);
+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
@@ -809,7 +820,7 @@ enum  {
 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);
+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);
@@ -823,9 +834,9 @@ enum  {
 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);
+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);
+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);
@@ -840,14 +851,14 @@ enum  {
 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);
+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);
+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);
+static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj);
 enum  {
 	PUBLISHING_RAJCE_TRANSACTION_DUMMY_PROPERTY
 };
@@ -859,11 +870,11 @@ enum  {
 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);
+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
 };
@@ -887,15 +898,15 @@ 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 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) {
 	RajceService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -906,9 +917,9 @@ 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 910 "RajcePublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 921 "RajcePublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" RAJCE_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -919,27 +930,27 @@ 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 923 "RajcePublishing.c"
+#line 934 "RajcePublishing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 927 "RajcePublishing.c"
+#line 938 "RajcePublishing.c"
 }
 
 
 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 934 "RajcePublishing.c"
+#line 945 "RajcePublishing.c"
 }
 
 
 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_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 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"
@@ -952,7 +963,7 @@ static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base, gin
 	result = _tmp2_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 956 "RajcePublishing.c"
+#line 967 "RajcePublishing.c"
 }
 
 
@@ -965,7 +976,7 @@ 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 969 "RajcePublishing.c"
+#line 980 "RajcePublishing.c"
 }
 
 
@@ -978,14 +989,14 @@ 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 982 "RajcePublishing.c"
+#line 993 "RajcePublishing.c"
 }
 
 
 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 989 "RajcePublishing.c"
+#line 1000 "RajcePublishing.c"
 }
 
 
@@ -996,34 +1007,33 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
 	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 1000 "RajcePublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 1011 "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 1006 "RajcePublishing.c"
+#line 1017 "RajcePublishing.c"
 	}
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1010 "RajcePublishing.c"
+#line 1021 "RajcePublishing.c"
 }
 
 
 static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	RajceService * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GdkPixbuf** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GdkPixbuf** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	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 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1035,68 +1045,66 @@ static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo*
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*info).authors = _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = _ ("Copyright © 2013 rajce.net");
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright © 2013 rajce.net"));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 ((*info).translators);
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 ((*info).version);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 ((*info).license);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8_ = rajce_service_icon_pixbuf_set;
+	_tmp7_ = rajce_service_icon_pixbuf_set;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp8__length1 = rajce_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = rajce_service_icon_pixbuf_set_length1;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup4 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup4 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 1092 "RajcePublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 1100 "RajcePublishing.c"
 }
 
 
 static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	RajceService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingRajceRajcePublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingRajceRajcePublisher* _tmp1_;
 #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"
@@ -1109,7 +1117,7 @@ static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublish
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1113 "RajcePublishing.c"
+#line 1121 "RajcePublishing.c"
 }
 
 
@@ -1122,7 +1130,7 @@ 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 1126 "RajcePublishing.c"
+#line 1134 "RajcePublishing.c"
 }
 
 
@@ -1130,7 +1138,7 @@ 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 1134 "RajcePublishing.c"
+#line 1142 "RajcePublishing.c"
 }
 
 
@@ -1139,7 +1147,7 @@ static void rajce_service_class_init (RajceServiceClass * klass) {
 	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 1143 "RajcePublishing.c"
+#line 1151 "RajcePublishing.c"
 }
 
 
@@ -1147,16 +1155,16 @@ static void rajce_service_spit_pluggable_interface_init (SpitPluggableIface * if
 #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"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) rajce_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) rajce_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) rajce_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) rajce_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) rajce_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) rajce_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) rajce_service_real_get_info;
+	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 1160 "RajcePublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) rajce_service_real_activation;
+#line 1168 "RajcePublishing.c"
 }
 
 
@@ -1164,10 +1172,10 @@ static void rajce_service_spit_publishing_service_interface_init (SpitPublishing
 #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;
+	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 1171 "RajcePublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) rajce_service_real_get_supported_media;
+#line 1179 "RajcePublishing.c"
 }
 
 
@@ -1175,13 +1183,13 @@ 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 1185 "RajcePublishing.c"
+#line 1193 "RajcePublishing.c"
 }
 
 
@@ -1203,14 +1211,14 @@ GType rajce_service_get_type (void) {
 
 PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingRajceRajcePublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	PublishingRajceSession* _tmp4_ = NULL;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	SpitPublishingPublishable** _tmp7_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	PublishingRajceSession* _tmp4_;
+	SpitPublishingPluginHost* _tmp5_;
+	gint _tmp6_;
+	SpitPublishingPublishable** _tmp7_;
 #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"
@@ -1245,7 +1253,7 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType
 	_tmp5_ = host;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = spit_publishing_plugin_host_get_publishables (_tmp5_, &_tmp6_);
-#line 1249 "RajcePublishing.c"
+#line 1257 "RajcePublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -1257,18 +1265,18 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType
 		p_collection_length1 = _tmp6_;
 #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 1261 "RajcePublishing.c"
-			SpitPublishingPublishable* _tmp8_ = NULL;
+#line 1269 "RajcePublishing.c"
+			SpitPublishingPublishable* _tmp8_;
 			SpitPublishingPublishable* p = NULL;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp8_ = _g_object_ref0 (p_collection[p_it]);
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			p = _tmp8_;
-#line 1268 "RajcePublishing.c"
+#line 1276 "RajcePublishing.c"
 			{
-				SpitPublishingPublisherMediaType _tmp9_ = 0;
-				SpitPublishingPublishable* _tmp10_ = NULL;
-				SpitPublishingPublisherMediaType _tmp11_ = 0;
+				SpitPublishingPublisherMediaType _tmp9_;
+				SpitPublishingPublishable* _tmp10_;
+				SpitPublishingPublisherMediaType _tmp11_;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp9_ = self->priv->media_type;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1279,29 +1287,29 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType
 				self->priv->media_type = _tmp9_ | _tmp11_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_g_object_unref0 (p);
-#line 1283 "RajcePublishing.c"
+#line 1291 "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 1288 "RajcePublishing.c"
+#line 1296 "RajcePublishing.c"
 	}
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 1292 "RajcePublishing.c"
+#line 1300 "RajcePublishing.c"
 }
 
 
 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 1299 "RajcePublishing.c"
+#line 1307 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL);
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1310,15 +1318,15 @@ 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 1314 "RajcePublishing.c"
+#line 1322 "RajcePublishing.c"
 }
 
 
 static SpitPublishingService* publishing_rajce_rajce_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingRajceRajcePublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1329,14 +1337,14 @@ 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 1333 "RajcePublishing.c"
+#line 1341 "RajcePublishing.c"
 }
 
 
 SpitPublishingPluginHost* publishing_rajce_rajce_publisher_get_host (PublishingRajceRajcePublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL);
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1347,14 +1355,14 @@ 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 1351 "RajcePublishing.c"
+#line 1359 "RajcePublishing.c"
 }
 
 
 static gboolean publishing_rajce_rajce_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingRajceRajcePublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1363,7 +1371,7 @@ 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 1367 "RajcePublishing.c"
+#line 1375 "RajcePublishing.c"
 }
 
 
@@ -1375,22 +1383,22 @@ 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 1379 "RajcePublishing.c"
+#line 1387 "RajcePublishing.c"
 }
 
 
 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 1386 "RajcePublishing.c"
+#line 1394 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingRajceRajcePublisher * self;
-	gboolean _tmp0_ = FALSE;
-	PublishingRajceSession* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	PublishingRajceSession* _tmp1_;
+	gboolean _tmp2_;
 #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"
@@ -1399,7 +1407,7 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher
 	if (_tmp0_) {
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 1403 "RajcePublishing.c"
+#line 1411 "RajcePublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_debug ("RajcePublishing.vala:111: RajcePublisher: start");
@@ -1415,17 +1423,17 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher
 		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 1419 "RajcePublishing.c"
+#line 1427 "RajcePublishing.c"
 	} else {
 		gchar* persistent_username = NULL;
-		gchar* _tmp3_ = NULL;
+		gchar* _tmp3_;
 		gchar* persistent_token = NULL;
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 		gboolean* persistent_remember = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean* _tmp6_ = NULL;
+		gboolean _tmp5_;
+		gboolean* _tmp6_;
 		gboolean _tmp7_ = FALSE;
-		const gchar* _tmp8_ = NULL;
+		const gchar* _tmp8_;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:121: RajcePublisher: session is not authenticated" \
 ".");
@@ -1447,24 +1455,24 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher
 		_tmp8_ = persistent_username;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (_tmp8_ != NULL) {
-#line 1450 "RajcePublishing.c"
-			const gchar* _tmp9_ = NULL;
+#line 1458 "RajcePublishing.c"
+			const gchar* _tmp9_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp9_ = persistent_token;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp7_ = _tmp9_ != NULL;
-#line 1456 "RajcePublishing.c"
+#line 1464 "RajcePublishing.c"
 		} else {
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp7_ = FALSE;
-#line 1460 "RajcePublishing.c"
+#line 1468 "RajcePublishing.c"
 		}
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (_tmp7_) {
-#line 1464 "RajcePublishing.c"
-			const gchar* _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
-			gboolean* _tmp12_ = NULL;
+#line 1472 "RajcePublishing.c"
+			const gchar* _tmp10_;
+			const gchar* _tmp11_;
+			gboolean* _tmp12_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp10_ = persistent_username;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1473,11 +1481,11 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher
 			_tmp12_ = 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 1476 "RajcePublishing.c"
+#line 1484 "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 1480 "RajcePublishing.c"
+#line 1488 "RajcePublishing.c"
 		}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (persistent_remember);
@@ -1485,7 +1493,7 @@ 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 1488 "RajcePublishing.c"
+#line 1496 "RajcePublishing.c"
 	}
 }
 
@@ -1498,13 +1506,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 1501 "RajcePublishing.c"
+#line 1509 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL);
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1513,14 +1521,14 @@ 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 1516 "RajcePublishing.c"
+#line 1524 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL);
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1531,13 +1539,13 @@ 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 1534 "RajcePublishing.c"
+#line 1542 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self, const gchar* username) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -1548,14 +1556,14 @@ static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajceP
 	_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 1551 "RajcePublishing.c"
+#line 1559 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), NULL);
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1566,13 +1574,13 @@ 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 1569 "RajcePublishing.c"
+#line 1577 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -1581,14 +1589,14 @@ static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePubl
 	_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 1584 "RajcePublishing.c"
+#line 1592 "RajcePublishing.c"
 }
 
 
 gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = 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"
@@ -1599,13 +1607,13 @@ gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePubl
 	result = _tmp1_;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1602 "RajcePublishing.c"
+#line 1610 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self, gboolean remember) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -1614,14 +1622,14 @@ static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajceP
 	_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 1617 "RajcePublishing.c"
+#line 1625 "RajcePublishing.c"
 }
 
 
 gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = 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"
@@ -1632,13 +1640,13 @@ gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePu
 	result = _tmp1_;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1635 "RajcePublishing.c"
+#line 1643 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self, gboolean hide_album) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -1647,14 +1655,14 @@ void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublis
 	_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 1650 "RajcePublishing.c"
+#line 1658 "RajcePublishing.c"
 }
 
 
 gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = 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"
@@ -1665,13 +1673,13 @@ gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePu
 	result = _tmp1_;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1668 "RajcePublishing.c"
+#line 1676 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self, gboolean show_album) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -1680,7 +1688,7 @@ void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublis
 	_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 1683 "RajcePublishing.c"
+#line 1691 "RajcePublishing.c"
 }
 
 
@@ -1690,19 +1698,19 @@ void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublis
 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 1693 "RajcePublishing.c"
+#line 1701 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self, PublishingRajceAuthenticationPaneMode mode) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajceAuthenticationPane* authentication_pane = NULL;
-	PublishingRajceAuthenticationPaneMode _tmp1_ = 0;
-	PublishingRajceAuthenticationPane* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
+	PublishingRajceAuthenticationPaneMode _tmp1_;
+	PublishingRajceAuthenticationPane* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	SpitPublishingPluginHost* _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"
@@ -1735,7 +1743,7 @@ static void publishing_rajce_rajce_publisher_do_show_authentication_pane (Publis
 	_g_object_unref0 (_tmp6_);
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 1738 "RajcePublishing.c"
+#line 1746 "RajcePublishing.c"
 }
 
 
@@ -1743,10 +1751,10 @@ static void publishing_rajce_rajce_publisher_do_show_authentication_pane (Publis
      * 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) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	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"
@@ -1761,7 +1769,7 @@ 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 1764 "RajcePublishing.c"
+#line 1772 "RajcePublishing.c"
 	}
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = username;
@@ -1771,7 +1779,7 @@ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicke
 	_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 1774 "RajcePublishing.c"
+#line 1782 "RajcePublishing.c"
 }
 
 
@@ -1781,32 +1789,32 @@ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicke
 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 1784 "RajcePublishing.c"
+#line 1792 "RajcePublishing.c"
 }
 
 
 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 1791 "RajcePublishing.c"
+#line 1799 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	gboolean _tmp2_;
+	const gchar* _tmp3_;
 	const gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 	PublishingRajceSessionLoginTransaction* login_trans = NULL;
-	PublishingRajceSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	PublishingRajceSessionLoginTransaction* _tmp12_ = NULL;
-	PublishingRajceSessionLoginTransaction* _tmp13_ = NULL;
+	PublishingRajceSession* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	const gchar* _tmp10_;
+	const gchar* _tmp11_;
+	PublishingRajceSessionLoginTransaction* _tmp12_;
+	PublishingRajceSessionLoginTransaction* _tmp13_;
 	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));
@@ -1836,17 +1844,17 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 	_tmp5_ = remember;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp5_) {
-#line 1839 "RajcePublishing.c"
-		const gchar* _tmp6_ = NULL;
+#line 1847 "RajcePublishing.c"
+		const gchar* _tmp6_;
 #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 1845 "RajcePublishing.c"
+#line 1853 "RajcePublishing.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = NULL;
-#line 1849 "RajcePublishing.c"
+#line 1857 "RajcePublishing.c"
 	}
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_set_token (self, _tmp4_);
@@ -1872,7 +1880,7 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 	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 1875 "RajcePublishing.c"
+#line 1883 "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_);
@@ -1880,7 +1888,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 1883 "RajcePublishing.c"
+#line 1891 "RajcePublishing.c"
 				goto __catch16_spit_publishing_publishing_error;
 			}
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1891,14 +1899,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 1894 "RajcePublishing.c"
+#line 1902 "RajcePublishing.c"
 		}
 	}
 	goto __finally16;
 	__catch16_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp14_ = NULL;
+		GError* _tmp14_;
 #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"
@@ -1911,7 +1919,7 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
 		publishing_rajce_rajce_publisher_do_show_error (self, _tmp14_);
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
-#line 1914 "RajcePublishing.c"
+#line 1922 "RajcePublishing.c"
 	}
 	__finally16:
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1924,11 +1932,11 @@ 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 1927 "RajcePublishing.c"
+#line 1935 "RajcePublishing.c"
 	}
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (login_trans);
-#line 1931 "RajcePublishing.c"
+#line 1939 "RajcePublishing.c"
 }
 
 
@@ -1940,15 +1948,15 @@ static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support
 	result = publishing_rajce_transaction_validate_xml (doc);
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 1943 "RajcePublishing.c"
+#line 1951 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _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));
@@ -1968,63 +1976,63 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, 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 1971 "RajcePublishing.c"
+#line 1979 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
+		PublishingRESTSupportTransaction* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		PublishingRESTSupportXmlDocument* _tmp7_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp9_ = NULL;
-		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp9_;
+		xmlNode* _tmp10_;
 		xmlNode* sessionToken = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
-		xmlNode* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp11_;
+		xmlNode* _tmp12_;
+		xmlNode* _tmp13_;
 		xmlNode* maxWidth = NULL;
-		PublishingRESTSupportXmlDocument* _tmp14_ = NULL;
-		xmlNode* _tmp15_ = NULL;
-		xmlNode* _tmp16_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp14_;
+		xmlNode* _tmp15_;
+		xmlNode* _tmp16_;
 		xmlNode* maxHeight = NULL;
-		PublishingRESTSupportXmlDocument* _tmp17_ = NULL;
-		xmlNode* _tmp18_ = NULL;
-		xmlNode* _tmp19_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp17_;
+		xmlNode* _tmp18_;
+		xmlNode* _tmp19_;
 		xmlNode* quality = NULL;
-		PublishingRESTSupportXmlDocument* _tmp20_ = NULL;
-		xmlNode* _tmp21_ = NULL;
-		xmlNode* _tmp22_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp20_;
+		xmlNode* _tmp21_;
+		xmlNode* _tmp22_;
 		xmlNode* nick = NULL;
-		PublishingRESTSupportXmlDocument* _tmp23_ = NULL;
-		xmlNode* _tmp24_ = NULL;
-		xmlNode* _tmp25_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp23_;
+		xmlNode* _tmp24_;
+		xmlNode* _tmp25_;
 		gint maxW = 0;
-		xmlNode* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
-		gint _tmp30_ = 0;
+		xmlNode* _tmp26_;
+		gchar* _tmp27_;
+		gchar* _tmp28_;
+		gint _tmp29_;
+		gint _tmp30_;
 		gint maxH = 0;
-		xmlNode* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
-		PublishingRajceSession* _tmp39_ = NULL;
-		xmlNode* _tmp40_ = NULL;
-		gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
-		xmlNode* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gint _tmp46_ = 0;
-		xmlNode* _tmp47_ = NULL;
-		gchar* _tmp48_ = NULL;
-		gchar* _tmp49_ = NULL;
-		gint _tmp50_ = 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_;
+		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;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2043,7 +2051,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 		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 2046 "RajcePublishing.c"
+#line 2054 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2052,7 +2060,7 @@ 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 2055 "RajcePublishing.c"
+#line 2063 "RajcePublishing.c"
 		}
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp9_ = doc;
@@ -2074,7 +2082,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			_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 2077 "RajcePublishing.c"
+#line 2085 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2085,7 +2093,7 @@ 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 2088 "RajcePublishing.c"
+#line 2096 "RajcePublishing.c"
 		}
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp14_ = doc;
@@ -2101,7 +2109,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			_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 2104 "RajcePublishing.c"
+#line 2112 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2112,7 +2120,7 @@ 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 2115 "RajcePublishing.c"
+#line 2123 "RajcePublishing.c"
 		}
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp17_ = doc;
@@ -2128,7 +2136,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			_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 2131 "RajcePublishing.c"
+#line 2139 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2139,7 +2147,7 @@ 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 2142 "RajcePublishing.c"
+#line 2150 "RajcePublishing.c"
 		}
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp20_ = doc;
@@ -2155,7 +2163,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			_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 2158 "RajcePublishing.c"
+#line 2166 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2166,7 +2174,7 @@ 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 2169 "RajcePublishing.c"
+#line 2177 "RajcePublishing.c"
 		}
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp23_ = doc;
@@ -2182,7 +2190,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			_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 2185 "RajcePublishing.c"
+#line 2193 "RajcePublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2193,7 +2201,7 @@ 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 2196 "RajcePublishing.c"
+#line 2204 "RajcePublishing.c"
 		}
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp26_ = maxWidth;
@@ -2229,13 +2237,13 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 		_tmp37_ = maxH;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (_tmp36_ > _tmp37_) {
-#line 2232 "RajcePublishing.c"
-			gint _tmp38_ = 0;
+#line 2240 "RajcePublishing.c"
+			gint _tmp38_;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp38_ = maxW;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			maxH = _tmp38_;
-#line 2238 "RajcePublishing.c"
+#line 2246 "RajcePublishing.c"
 		}
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp39_ = self->priv->session;
@@ -2271,17 +2279,17 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 		_g_free0 (_tmp42_);
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 2274 "RajcePublishing.c"
+#line 2282 "RajcePublishing.c"
 	}
 	goto __finally17;
 	__catch17_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gint code_int = 0;
-		GError* _tmp51_ = NULL;
-		const gchar* _tmp52_ = NULL;
-		gint _tmp53_ = 0;
-		gint _tmp54_ = 0;
+		GError* _tmp51_;
+		const gchar* _tmp52_;
+		gint _tmp53_;
+		gint _tmp54_;
 #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"
@@ -2302,22 +2310,22 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
 			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 2305 "RajcePublishing.c"
+#line 2313 "RajcePublishing.c"
 		} else {
-			GError* _tmp55_ = NULL;
+			GError* _tmp55_;
 #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;
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			publishing_rajce_rajce_publisher_do_show_error (self, _tmp55_);
-#line 2314 "RajcePublishing.c"
+#line 2322 "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 2320 "RajcePublishing.c"
+#line 2328 "RajcePublishing.c"
 	}
 	__finally17:
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2328,11 +2336,11 @@ 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 2331 "RajcePublishing.c"
+#line 2339 "RajcePublishing.c"
 	}
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_fetch_albums (self);
-#line 2335 "RajcePublishing.c"
+#line 2343 "RajcePublishing.c"
 }
 
 
@@ -2340,10 +2348,10 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _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"
@@ -2364,7 +2372,7 @@ static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingR
 	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 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 2367 "RajcePublishing.c"
+#line 2375 "RajcePublishing.c"
 }
 
 
@@ -2374,26 +2382,26 @@ static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingR
 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 2377 "RajcePublishing.c"
+#line 2385 "RajcePublishing.c"
 }
 
 
 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 2384 "RajcePublishing.c"
+#line 2392 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRajcePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingRajceGetAlbumsTransaction* get_albums_trans = NULL;
-	PublishingRajceSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	PublishingRajceGetAlbumsTransaction* _tmp5_ = NULL;
-	PublishingRajceGetAlbumsTransaction* _tmp6_ = NULL;
+	PublishingRajceSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	PublishingRajceGetAlbumsTransaction* _tmp5_;
+	PublishingRajceGetAlbumsTransaction* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -2425,7 +2433,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 2428 "RajcePublishing.c"
+#line 2436 "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_);
@@ -2433,7 +2441,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 2436 "RajcePublishing.c"
+#line 2444 "RajcePublishing.c"
 				goto __catch18_spit_publishing_publishing_error;
 			}
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2444,14 +2452,14 @@ 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 2447 "RajcePublishing.c"
+#line 2455 "RajcePublishing.c"
 		}
 	}
 	goto __finally18;
 	__catch18_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2464,7 +2472,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 2467 "RajcePublishing.c"
+#line 2475 "RajcePublishing.c"
 	}
 	__finally18:
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2477,11 +2485,11 @@ 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 2480 "RajcePublishing.c"
+#line 2488 "RajcePublishing.c"
 	}
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (get_albums_trans);
-#line 2484 "RajcePublishing.c"
+#line 2492 "RajcePublishing.c"
 }
 
 
@@ -2493,22 +2501,22 @@ static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpoi
 	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 2496 "RajcePublishing.c"
+#line 2504 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	PublishingRajceAlbum** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	PublishingRajceAlbum** _tmp7_;
+	gint _tmp7__length1;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp8_ = NULL;
+	GeeArrayList* _tmp8_;
 	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));
@@ -2552,39 +2560,39 @@ 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 2555 "RajcePublishing.c"
+#line 2563 "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);
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	list = _tmp8_;
-#line 2561 "RajcePublishing.c"
+#line 2569 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp13_ = NULL;
+		PublishingRESTSupportTransaction* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		PublishingRESTSupportXmlDocument* _tmp13_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp14_ = NULL;
-		xmlNode* _tmp15_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp14_;
+		xmlNode* _tmp15_;
 		xmlNode* sessionToken = NULL;
-		PublishingRESTSupportXmlDocument* _tmp16_ = NULL;
-		xmlNode* _tmp17_ = NULL;
-		xmlNode* _tmp18_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp16_;
+		xmlNode* _tmp17_;
+		xmlNode* _tmp18_;
 		xmlNode* nodealbums = NULL;
-		PublishingRESTSupportXmlDocument* _tmp19_ = NULL;
-		xmlNode* _tmp20_ = NULL;
-		xmlNode* _tmp21_ = NULL;
-		GeeArrayList* _tmp96_ = NULL;
-		GeeArrayList* _tmp97_ = NULL;
-		gint _tmp98_ = 0;
-		gpointer* _tmp99_ = NULL;
-		PublishingRajceSession* _tmp100_ = NULL;
-		xmlNode* _tmp101_ = NULL;
-		gchar* _tmp102_ = NULL;
-		gchar* _tmp103_ = 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;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2603,7 +2611,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 		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 2606 "RajcePublishing.c"
+#line 2614 "RajcePublishing.c"
 				goto __catch19_spit_publishing_publishing_error;
 			}
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2614,7 +2622,7 @@ 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 2617 "RajcePublishing.c"
+#line 2625 "RajcePublishing.c"
 		}
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp14_ = doc;
@@ -2636,7 +2644,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 			_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 2639 "RajcePublishing.c"
+#line 2647 "RajcePublishing.c"
 				goto __catch19_spit_publishing_publishing_error;
 			}
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2649,7 +2657,7 @@ 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 2652 "RajcePublishing.c"
+#line 2660 "RajcePublishing.c"
 		}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp19_ = doc;
@@ -2665,7 +2673,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 			_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 2668 "RajcePublishing.c"
+#line 2676 "RajcePublishing.c"
 				goto __catch19_spit_publishing_publishing_error;
 			}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2678,116 +2686,116 @@ 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 2681 "RajcePublishing.c"
+#line 2689 "RajcePublishing.c"
 		}
 		{
 			xmlNode* album = NULL;
-			xmlNode* _tmp22_ = NULL;
-			xmlNode* _tmp23_ = NULL;
+			xmlNode* _tmp22_;
+			xmlNode* _tmp23_;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp22_ = nodealbums;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp23_ = _tmp22_->children;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			album = _tmp23_;
-#line 2693 "RajcePublishing.c"
+#line 2701 "RajcePublishing.c"
 			{
 				gboolean _tmp24_ = FALSE;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp24_ = TRUE;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				while (TRUE) {
-#line 2700 "RajcePublishing.c"
-					xmlNode* _tmp27_ = NULL;
+#line 2708 "RajcePublishing.c"
+					xmlNode* _tmp27_;
 					gint id = 0;
-					xmlNode* _tmp28_ = NULL;
-					gchar* _tmp29_ = NULL;
-					gchar* _tmp30_ = NULL;
-					gint _tmp31_ = 0;
-					gint _tmp32_ = 0;
+					xmlNode* _tmp28_;
+					gchar* _tmp29_;
+					gchar* _tmp30_;
+					gint _tmp31_;
+					gint _tmp32_;
 					xmlNode* _tmp33_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp34_ = NULL;
-					xmlNode* _tmp35_ = NULL;
-					xmlNode* _tmp36_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp34_;
+					xmlNode* _tmp35_;
+					xmlNode* _tmp36_;
 					gchar* albumName = NULL;
-					gchar* _tmp37_ = NULL;
+					gchar* _tmp37_;
 					xmlNode* _tmp38_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp39_ = NULL;
-					xmlNode* _tmp40_ = NULL;
-					xmlNode* _tmp41_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp39_;
+					xmlNode* _tmp40_;
+					xmlNode* _tmp41_;
 					gchar* url = NULL;
-					gchar* _tmp42_ = NULL;
+					gchar* _tmp42_;
 					xmlNode* _tmp43_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp44_ = NULL;
-					xmlNode* _tmp45_ = NULL;
-					xmlNode* _tmp46_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp44_;
+					xmlNode* _tmp45_;
+					xmlNode* _tmp46_;
 					gchar* thumbUrl = NULL;
-					gchar* _tmp47_ = NULL;
+					gchar* _tmp47_;
 					xmlNode* _tmp48_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp49_ = NULL;
-					xmlNode* _tmp50_ = NULL;
-					xmlNode* _tmp51_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp49_;
+					xmlNode* _tmp50_;
+					xmlNode* _tmp51_;
 					gchar* createDate = NULL;
-					gchar* _tmp52_ = NULL;
+					gchar* _tmp52_;
 					xmlNode* _tmp53_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp54_ = NULL;
-					xmlNode* _tmp55_ = NULL;
-					xmlNode* _tmp56_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp54_;
+					xmlNode* _tmp55_;
+					xmlNode* _tmp56_;
 					gchar* updateDate = NULL;
-					gchar* _tmp57_ = NULL;
+					gchar* _tmp57_;
 					gboolean _tmp58_ = FALSE;
 					xmlNode* _tmp59_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp60_ = NULL;
-					xmlNode* _tmp61_ = NULL;
-					xmlNode* _tmp62_ = NULL;
-					gchar* _tmp63_ = NULL;
-					gchar* _tmp64_ = NULL;
-					gint _tmp65_ = 0;
-					gboolean _tmp66_ = FALSE;
+					PublishingRESTSupportXmlDocument* _tmp60_;
+					xmlNode* _tmp61_;
+					xmlNode* _tmp62_;
+					gchar* _tmp63_;
+					gchar* _tmp64_;
+					gint _tmp65_;
+					gboolean _tmp66_;
 					gboolean hidden = FALSE;
 					gboolean _tmp67_ = FALSE;
 					xmlNode* _tmp68_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp69_ = NULL;
-					xmlNode* _tmp70_ = NULL;
-					xmlNode* _tmp71_ = NULL;
-					gchar* _tmp72_ = NULL;
-					gchar* _tmp73_ = NULL;
-					gint _tmp74_ = 0;
-					gboolean _tmp75_ = FALSE;
+					PublishingRESTSupportXmlDocument* _tmp69_;
+					xmlNode* _tmp70_;
+					xmlNode* _tmp71_;
+					gchar* _tmp72_;
+					gchar* _tmp73_;
+					gint _tmp74_;
+					gboolean _tmp75_;
 					gboolean secure = FALSE;
 					xmlNode* _tmp76_ = NULL;
-					PublishingRESTSupportXmlDocument* _tmp77_ = NULL;
-					xmlNode* _tmp78_ = NULL;
-					xmlNode* _tmp79_ = NULL;
+					PublishingRESTSupportXmlDocument* _tmp77_;
+					xmlNode* _tmp78_;
+					xmlNode* _tmp79_;
 					gint photoCount = 0;
-					gchar* _tmp80_ = NULL;
-					gchar* _tmp81_ = NULL;
-					gint _tmp82_ = 0;
-					gint _tmp83_ = 0;
-					GeeArrayList* _tmp84_ = NULL;
-					gint _tmp85_ = 0;
-					const gchar* _tmp86_ = NULL;
-					const gchar* _tmp87_ = NULL;
-					const gchar* _tmp88_ = NULL;
-					const gchar* _tmp89_ = NULL;
-					const gchar* _tmp90_ = NULL;
-					gboolean _tmp91_ = FALSE;
-					gboolean _tmp92_ = FALSE;
-					gint _tmp93_ = 0;
-					PublishingRajceAlbum* _tmp94_ = NULL;
-					PublishingRajceAlbum* _tmp95_ = NULL;
+					gchar* _tmp80_;
+					gchar* _tmp81_;
+					gint _tmp82_;
+					gint _tmp83_;
+					GeeArrayList* _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_;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					if (!_tmp24_) {
-#line 2781 "RajcePublishing.c"
-						xmlNode* _tmp25_ = NULL;
-						xmlNode* _tmp26_ = NULL;
+#line 2789 "RajcePublishing.c"
+						xmlNode* _tmp25_;
+						xmlNode* _tmp26_;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_tmp25_ = album;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_tmp26_ = _tmp25_->next;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						album = _tmp26_;
-#line 2790 "RajcePublishing.c"
+#line 2798 "RajcePublishing.c"
 					}
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp24_ = FALSE;
@@ -2797,7 +2805,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 					if (!(_tmp27_ != NULL)) {
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						break;
-#line 2800 "RajcePublishing.c"
+#line 2808 "RajcePublishing.c"
 					}
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp28_ = album;
@@ -2827,7 +2835,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 						_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 2830 "RajcePublishing.c"
+#line 2838 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2840,7 +2848,7 @@ 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 2843 "RajcePublishing.c"
+#line 2851 "RajcePublishing.c"
 					}
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp37_ = (gchar*) xmlNodeGetContent (_tmp33_);
@@ -2862,7 +2870,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 2865 "RajcePublishing.c"
+#line 2873 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2877,7 +2885,7 @@ 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 2880 "RajcePublishing.c"
+#line 2888 "RajcePublishing.c"
 					}
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp42_ = (gchar*) xmlNodeGetContent (_tmp38_);
@@ -2901,7 +2909,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 2904 "RajcePublishing.c"
+#line 2912 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2918,7 +2926,7 @@ 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 2921 "RajcePublishing.c"
+#line 2929 "RajcePublishing.c"
 					}
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp47_ = (gchar*) xmlNodeGetContent (_tmp43_);
@@ -2944,7 +2952,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 2947 "RajcePublishing.c"
+#line 2955 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2963,7 +2971,7 @@ 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 2966 "RajcePublishing.c"
+#line 2974 "RajcePublishing.c"
 					}
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp52_ = (gchar*) xmlNodeGetContent (_tmp48_);
@@ -2991,7 +2999,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 2994 "RajcePublishing.c"
+#line 3002 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3012,7 +3020,7 @@ 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 3015 "RajcePublishing.c"
+#line 3023 "RajcePublishing.c"
 					}
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp57_ = (gchar*) xmlNodeGetContent (_tmp53_);
@@ -3042,7 +3050,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 3045 "RajcePublishing.c"
+#line 3053 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3065,7 +3073,7 @@ 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 3068 "RajcePublishing.c"
+#line 3076 "RajcePublishing.c"
 					}
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp63_ = (gchar*) xmlNodeGetContent (_tmp59_);
@@ -3081,11 +3089,11 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 					if (_tmp66_) {
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_tmp58_ = TRUE;
-#line 3084 "RajcePublishing.c"
+#line 3092 "RajcePublishing.c"
 					} else {
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_tmp58_ = FALSE;
-#line 3088 "RajcePublishing.c"
+#line 3096 "RajcePublishing.c"
 					}
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					hidden = _tmp58_;
@@ -3113,7 +3121,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 3116 "RajcePublishing.c"
+#line 3124 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3136,7 +3144,7 @@ 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 3139 "RajcePublishing.c"
+#line 3147 "RajcePublishing.c"
 					}
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp72_ = (gchar*) xmlNodeGetContent (_tmp68_);
@@ -3152,11 +3160,11 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 					if (_tmp75_) {
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_tmp67_ = TRUE;
-#line 3155 "RajcePublishing.c"
+#line 3163 "RajcePublishing.c"
 					} else {
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_tmp67_ = FALSE;
-#line 3159 "RajcePublishing.c"
+#line 3167 "RajcePublishing.c"
 					}
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					secure = _tmp67_;
@@ -3184,7 +3192,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 3187 "RajcePublishing.c"
+#line 3195 "RajcePublishing.c"
 							goto __catch19_spit_publishing_publishing_error;
 						}
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3207,7 +3215,7 @@ 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 3210 "RajcePublishing.c"
+#line 3218 "RajcePublishing.c"
 					}
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp80_ = (gchar*) xmlNodeGetContent (_tmp76_);
@@ -3259,7 +3267,7 @@ 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 3262 "RajcePublishing.c"
+#line 3270 "RajcePublishing.c"
 				}
 			}
 		}
@@ -3293,13 +3301,13 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 		_g_free0 (_tmp103_);
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 3296 "RajcePublishing.c"
+#line 3304 "RajcePublishing.c"
 	}
 	goto __finally19;
 	__catch19_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp104_ = NULL;
+		GError* _tmp104_;
 #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"
@@ -3316,7 +3324,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
 		_g_object_unref0 (list);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 3319 "RajcePublishing.c"
+#line 3327 "RajcePublishing.c"
 	}
 	__finally19:
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3329,13 +3337,13 @@ 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 3332 "RajcePublishing.c"
+#line 3340 "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 3338 "RajcePublishing.c"
+#line 3346 "RajcePublishing.c"
 }
 
 
@@ -3343,12 +3351,12 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	GError* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _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"
@@ -3373,7 +3381,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRa
 	_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 3376 "RajcePublishing.c"
+#line 3384 "RajcePublishing.c"
 }
 
 
@@ -3383,31 +3391,31 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRa
 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 3386 "RajcePublishing.c"
+#line 3394 "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) {
 #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 3393 "RajcePublishing.c"
+#line 3401 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajcePublishingOptionsPane* opts_pane = NULL;
-	PublishingRajceSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingRajceAlbum** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PublishingRajcePublishingOptionsPane* _tmp5_ = NULL;
-	PublishingRajcePublishingOptionsPane* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
-	GtkWidget* _tmp10_ = NULL;
+	PublishingRajceSession* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRajceAlbum** _tmp4_;
+	gint _tmp4__length1;
+	PublishingRajcePublishingOptionsPane* _tmp5_;
+	PublishingRajcePublishingOptionsPane* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	SpitPublishingPluginHost* _tmp8_;
+	GtkWidget* _tmp9_;
+	GtkWidget* _tmp10_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3454,7 +3462,7 @@ 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 3457 "RajcePublishing.c"
+#line 3465 "RajcePublishing.c"
 }
 
 
@@ -3462,7 +3470,7 @@ static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (Pu
      * 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) {
-	PublishingRajceSession* _tmp0_ = NULL;
+	PublishingRajceSession* _tmp0_;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3474,7 +3482,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 3476 "RajcePublishing.c"
+#line 3484 "RajcePublishing.c"
 }
 
 
@@ -3486,13 +3494,13 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_c
 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 3488 "RajcePublishing.c"
+#line 3496 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self, PublishingRajcePublishingParameters* parameters) {
-	PublishingRajcePublishingParameters* _tmp0_ = NULL;
-	PublishingRajcePublishingParameters* _tmp1_ = NULL;
+	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"
@@ -3510,71 +3518,71 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_
 	self->priv->parameters = _tmp1_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_begin_upload (self);
-#line 3511 "RajcePublishing.c"
+#line 3519 "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 3523 "RajcePublishing.c"
+#line 3531 "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 3529 "RajcePublishing.c"
+#line 3537 "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 3535 "RajcePublishing.c"
+#line 3543 "RajcePublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return (*s1) == (*s2);
-#line 3539 "RajcePublishing.c"
+#line 3547 "RajcePublishing.c"
 }
 
 
 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 3546 "RajcePublishing.c"
+#line 3554 "RajcePublishing.c"
 }
 
 
 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 3553 "RajcePublishing.c"
+#line 3561 "RajcePublishing.c"
 }
 
 
 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 3560 "RajcePublishing.c"
+#line 3568 "RajcePublishing.c"
 }
 
 
 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 3567 "RajcePublishing.c"
+#line 3575 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingRajcePublishingParameters* _tmp1_ = NULL;
-	gint* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingRajcePublishingParameters* _tmp1_;
+	gint* _tmp2_;
+	gint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -3590,19 +3598,19 @@ 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 3591 "RajcePublishing.c"
+#line 3599 "RajcePublishing.c"
 		PublishingRajceCreateAlbumTransaction* create_album_trans = NULL;
-		PublishingRajceSession* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		PublishingRajcePublishingParameters* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		PublishingRajcePublishingParameters* _tmp9_ = NULL;
-		gboolean* _tmp10_ = NULL;
-		PublishingRajceCreateAlbumTransaction* _tmp11_ = NULL;
-		PublishingRajceCreateAlbumTransaction* _tmp12_ = NULL;
-		PublishingRajceCreateAlbumTransaction* _tmp13_ = NULL;
-		PublishingRajceCreateAlbumTransaction* _tmp14_ = NULL;
+		PublishingRajceSession* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		PublishingRajcePublishingParameters* _tmp7_;
+		const gchar* _tmp8_;
+		PublishingRajcePublishingParameters* _tmp9_;
+		gboolean* _tmp10_;
+		PublishingRajceCreateAlbumTransaction* _tmp11_;
+		PublishingRajceCreateAlbumTransaction* _tmp12_;
+		PublishingRajceCreateAlbumTransaction* _tmp13_;
+		PublishingRajceCreateAlbumTransaction* _tmp14_;
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:389: ACTION: closing album");
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3635,9 +3643,9 @@ 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 3636 "RajcePublishing.c"
+#line 3644 "RajcePublishing.c"
 		{
-			PublishingRajceCreateAlbumTransaction* _tmp15_ = NULL;
+			PublishingRajceCreateAlbumTransaction* _tmp15_;
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp15_ = create_album_trans;
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3646,7 +3654,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 3647 "RajcePublishing.c"
+#line 3655 "RajcePublishing.c"
 					goto __catch20_spit_publishing_publishing_error;
 				}
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3657,14 +3665,14 @@ 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 3658 "RajcePublishing.c"
+#line 3666 "RajcePublishing.c"
 			}
 		}
 		goto __finally20;
 		__catch20_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp16_ = NULL;
+			GError* _tmp16_;
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			err = _inner_error_;
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3677,7 +3685,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 3678 "RajcePublishing.c"
+#line 3686 "RajcePublishing.c"
 		}
 		__finally20:
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3690,22 +3698,22 @@ 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 3691 "RajcePublishing.c"
+#line 3699 "RajcePublishing.c"
 		}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_transaction_unref0 (create_album_trans);
-#line 3695 "RajcePublishing.c"
+#line 3703 "RajcePublishing.c"
 	} else {
 		PublishingRajceOpenAlbumTransaction* open_album_trans = NULL;
-		PublishingRajceSession* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		PublishingRajcePublishingParameters* _tmp20_ = NULL;
-		gint* _tmp21_ = NULL;
-		PublishingRajceOpenAlbumTransaction* _tmp22_ = NULL;
-		PublishingRajceOpenAlbumTransaction* _tmp23_ = NULL;
-		PublishingRajceOpenAlbumTransaction* _tmp24_ = NULL;
-		PublishingRajceOpenAlbumTransaction* _tmp25_ = NULL;
+		PublishingRajceSession* _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
+		PublishingRajcePublishingParameters* _tmp20_;
+		gint* _tmp21_;
+		PublishingRajceOpenAlbumTransaction* _tmp22_;
+		PublishingRajceOpenAlbumTransaction* _tmp23_;
+		PublishingRajceOpenAlbumTransaction* _tmp24_;
+		PublishingRajceOpenAlbumTransaction* _tmp25_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_debug ("RajcePublishing.vala:406: ACTION: opening album");
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3734,9 +3742,9 @@ 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 3735 "RajcePublishing.c"
+#line 3743 "RajcePublishing.c"
 		{
-			PublishingRajceOpenAlbumTransaction* _tmp26_ = NULL;
+			PublishingRajceOpenAlbumTransaction* _tmp26_;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp26_ = open_album_trans;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3745,7 +3753,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 3746 "RajcePublishing.c"
+#line 3754 "RajcePublishing.c"
 					goto __catch21_spit_publishing_publishing_error;
 				}
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3756,14 +3764,14 @@ 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 3757 "RajcePublishing.c"
+#line 3765 "RajcePublishing.c"
 			}
 		}
 		goto __finally21;
 		__catch21_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp27_ = NULL;
+			GError* _tmp27_;
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			err = _inner_error_;
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3776,7 +3784,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 3777 "RajcePublishing.c"
+#line 3785 "RajcePublishing.c"
 		}
 		__finally21:
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3789,11 +3797,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 3790 "RajcePublishing.c"
+#line 3798 "RajcePublishing.c"
 		}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_transaction_unref0 (open_album_trans);
-#line 3794 "RajcePublishing.c"
+#line 3802 "RajcePublishing.c"
 	}
 }
 
@@ -3809,25 +3817,25 @@ 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 3810 "RajcePublishing.c"
+#line 3818 "RajcePublishing.c"
 }
 
 
 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 3817 "RajcePublishing.c"
+#line 3825 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	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));
@@ -3857,42 +3865,42 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 	g_debug ("RajcePublishing.vala:430: RajcePlugin: create album: %s", _tmp6_);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp6_);
-#line 3858 "RajcePublishing.c"
+#line 3866 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp11_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
 		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_ = NULL;
-		xmlNode* _tmp16_ = NULL;
-		xmlNode* _tmp17_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp15_;
+		xmlNode* _tmp16_;
+		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_ = NULL;
+		gchar* _tmp18_;
 		xmlNode* _tmp19_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp20_ = NULL;
-		xmlNode* _tmp21_ = NULL;
-		xmlNode* _tmp22_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp20_;
+		xmlNode* _tmp21_;
+		xmlNode* _tmp22_;
 		gchar* albumToken = NULL;
-		gchar* _tmp23_ = NULL;
+		gchar* _tmp23_;
 		xmlNode* _tmp24_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp25_ = NULL;
-		xmlNode* _tmp26_ = NULL;
-		xmlNode* _tmp27_ = NULL;
-		PublishingRajcePublishingParameters* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gint _tmp31_ = 0;
-		gint* _tmp32_ = NULL;
-		PublishingRajceSession* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-		PublishingRajceSession* _tmp35_ = NULL;
-		const gchar* _tmp36_ = 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;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3911,7 +3919,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 		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 3912 "RajcePublishing.c"
+#line 3920 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3920,7 +3928,7 @@ 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 3921 "RajcePublishing.c"
+#line 3929 "RajcePublishing.c"
 		}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = doc;
@@ -3942,7 +3950,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 			_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 3943 "RajcePublishing.c"
+#line 3951 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3953,7 +3961,7 @@ 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 3954 "RajcePublishing.c"
+#line 3962 "RajcePublishing.c"
 		}
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
@@ -3975,7 +3983,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 3976 "RajcePublishing.c"
+#line 3984 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3988,7 +3996,7 @@ 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 3989 "RajcePublishing.c"
+#line 3997 "RajcePublishing.c"
 		}
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
@@ -4012,7 +4020,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 4013 "RajcePublishing.c"
+#line 4021 "RajcePublishing.c"
 				goto __catch22_spit_publishing_publishing_error;
 			}
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4027,7 +4035,7 @@ 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 4028 "RajcePublishing.c"
+#line 4036 "RajcePublishing.c"
 		}
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp28_ = self->priv->parameters;
@@ -4063,13 +4071,13 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 		_g_free0 (sessionToken);
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4064 "RajcePublishing.c"
+#line 4072 "RajcePublishing.c"
 	}
 	goto __finally22;
 	__catch22_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp37_ = NULL;
+		GError* _tmp37_;
 #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"
@@ -4084,7 +4092,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
 		_g_error_free0 (err);
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4085 "RajcePublishing.c"
+#line 4093 "RajcePublishing.c"
 	}
 	__finally22:
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4095,11 +4103,11 @@ 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 4096 "RajcePublishing.c"
+#line 4104 "RajcePublishing.c"
 	}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_upload_photos (self);
-#line 4100 "RajcePublishing.c"
+#line 4108 "RajcePublishing.c"
 }
 
 
@@ -4107,12 +4115,12 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	GError* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _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"
@@ -4137,7 +4145,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRa
 	_tmp5_ = err;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4138 "RajcePublishing.c"
+#line 4146 "RajcePublishing.c"
 }
 
 
@@ -4145,13 +4153,13 @@ static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRa
      * Event triggered when the open album completes successfully.
      */
 static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	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));
@@ -4181,33 +4189,33 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 	g_debug ("RajcePublishing.vala:469: RajcePlugin: open album: %s", _tmp6_);
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4182 "RajcePublishing.c"
+#line 4190 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp11_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
 		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_ = NULL;
-		xmlNode* _tmp16_ = NULL;
-		xmlNode* _tmp17_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp15_;
+		xmlNode* _tmp16_;
+		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_ = NULL;
+		gchar* _tmp18_;
 		xmlNode* _tmp19_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp20_ = NULL;
-		xmlNode* _tmp21_ = NULL;
-		xmlNode* _tmp22_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp20_;
+		xmlNode* _tmp21_;
+		xmlNode* _tmp22_;
 		gchar* albumToken = NULL;
-		gchar* _tmp23_ = NULL;
-		PublishingRajceSession* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		PublishingRajceSession* _tmp26_ = NULL;
-		const gchar* _tmp27_ = 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;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4226,7 +4234,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 		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 4227 "RajcePublishing.c"
+#line 4235 "RajcePublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4235,7 +4243,7 @@ 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 4236 "RajcePublishing.c"
+#line 4244 "RajcePublishing.c"
 		}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = doc;
@@ -4257,7 +4265,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 			_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 4258 "RajcePublishing.c"
+#line 4266 "RajcePublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4268,7 +4276,7 @@ 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 4269 "RajcePublishing.c"
+#line 4277 "RajcePublishing.c"
 		}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
@@ -4290,7 +4298,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 4291 "RajcePublishing.c"
+#line 4299 "RajcePublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4303,7 +4311,7 @@ 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 4304 "RajcePublishing.c"
+#line 4312 "RajcePublishing.c"
 		}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
@@ -4327,13 +4335,13 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 		_g_free0 (sessionToken);
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4328 "RajcePublishing.c"
+#line 4336 "RajcePublishing.c"
 	}
 	goto __finally23;
 	__catch23_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp28_ = NULL;
+		GError* _tmp28_;
 #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"
@@ -4348,7 +4356,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
 		_g_error_free0 (err);
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 4349 "RajcePublishing.c"
+#line 4357 "RajcePublishing.c"
 	}
 	__finally23:
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4359,11 +4367,11 @@ 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 4360 "RajcePublishing.c"
+#line 4368 "RajcePublishing.c"
 	}
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_upload_photos (self);
-#line 4364 "RajcePublishing.c"
+#line 4372 "RajcePublishing.c"
 }
 
 
@@ -4371,12 +4379,12 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	GError* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _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"
@@ -4401,7 +4409,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajc
 	_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 4402 "RajcePublishing.c"
+#line 4410 "RajcePublishing.c"
 }
 
 
@@ -4411,44 +4419,44 @@ static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajc
 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 4412 "RajcePublishing.c"
+#line 4420 "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) {
 #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 4419 "RajcePublishing.c"
+#line 4427 "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) {
 #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 4426 "RajcePublishing.c"
+#line 4434 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingRajceSession* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	void* _tmp3_ = NULL;
-	GDestroyNotify _tmp4_ = NULL;
-	SpitPublishingProgressCallback _tmp5_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingRajceSession* _tmp1_;
+	gint _tmp2_;
+	void* _tmp3_;
+	GDestroyNotify _tmp4_;
+	SpitPublishingProgressCallback _tmp5_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	SpitPublishingPublishable** _tmp8_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp6_;
+	gint _tmp7_;
+	SpitPublishingPublishable** _tmp8_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	PublishingRajceUploader* uploader = NULL;
-	PublishingRajceSession* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	PublishingRajcePublishingParameters* _tmp12_ = NULL;
-	PublishingRajceUploader* _tmp13_ = NULL;
-	PublishingRajceUploader* _tmp14_ = NULL;
+	PublishingRajceSession* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	PublishingRajcePublishingParameters* _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"
@@ -4511,7 +4519,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 4512 "RajcePublishing.c"
+#line 4520 "RajcePublishing.c"
 }
 
 
@@ -4520,10 +4528,10 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportBatchUploader* _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"
@@ -4544,7 +4552,7 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi
 	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 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_end_upload (self);
-#line 4545 "RajcePublishing.c"
+#line 4553 "RajcePublishing.c"
 }
 
 
@@ -4553,11 +4561,11 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
+	PublishingRESTSupportBatchUploader* _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"
@@ -4580,7 +4588,7 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingR
 	_tmp4_ = err;
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_error (self, _tmp4_);
-#line 4581 "RajcePublishing.c"
+#line 4589 "RajcePublishing.c"
 }
 
 
@@ -4588,21 +4596,21 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingR
      * 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_ = FALSE;
+	gboolean _tmp0_;
 #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 4596 "RajcePublishing.c"
-		gdouble _tmp1_ = 0.0;
-		SpitPublishingProgressCallback _tmp2_ = NULL;
-		void* _tmp2__target = NULL;
-		SpitPublishingProgressCallback _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
-		gint _tmp4_ = 0;
-		gdouble _tmp5_ = 0.0;
+#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;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4624,13 +4632,13 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (Pu
 		_tmp5_ = completed_fraction;
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4624 "RajcePublishing.c"
+#line 4632 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #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"
@@ -4639,11 +4647,11 @@ static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajce
 	if (_tmp0_) {
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_rajce_publisher_do_get_album_url (self);
-#line 4639 "RajcePublishing.c"
+#line 4647 "RajcePublishing.c"
 	} else {
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_rajce_publisher_do_close_album (self);
-#line 4643 "RajcePublishing.c"
+#line 4651 "RajcePublishing.c"
 	}
 }
 
@@ -4654,25 +4662,25 @@ static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajce
 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 4654 "RajcePublishing.c"
+#line 4662 "RajcePublishing.c"
 }
 
 
 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 4661 "RajcePublishing.c"
+#line 4669 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajceGetAlbumUrlTransaction* get_album_url_trans = NULL;
-	PublishingRajceSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingRajceGetAlbumUrlTransaction* _tmp4_ = NULL;
-	PublishingRajceGetAlbumUrlTransaction* _tmp5_ = NULL;
+	PublishingRajceSession* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRajceGetAlbumUrlTransaction* _tmp4_;
+	PublishingRajceGetAlbumUrlTransaction* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -4700,7 +4708,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 4700 "RajcePublishing.c"
+#line 4708 "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_);
@@ -4708,7 +4716,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 4708 "RajcePublishing.c"
+#line 4716 "RajcePublishing.c"
 				goto __catch24_spit_publishing_publishing_error;
 			}
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4719,14 +4727,14 @@ 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 4719 "RajcePublishing.c"
+#line 4727 "RajcePublishing.c"
 		}
 	}
 	goto __finally24;
 	__catch24_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4739,7 +4747,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 4739 "RajcePublishing.c"
+#line 4747 "RajcePublishing.c"
 	}
 	__finally24:
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4752,11 +4760,11 @@ 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 4752 "RajcePublishing.c"
+#line 4760 "RajcePublishing.c"
 	}
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (get_album_url_trans);
-#line 4756 "RajcePublishing.c"
+#line 4764 "RajcePublishing.c"
 }
 
 
@@ -4764,13 +4772,13 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	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));
@@ -4800,33 +4808,33 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 	g_debug ("RajcePublishing.vala:594: RajcePlugin: get album url: %s", _tmp6_);
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4800 "RajcePublishing.c"
+#line 4808 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp11_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
 		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_ = NULL;
-		xmlNode* _tmp16_ = NULL;
-		xmlNode* _tmp17_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp15_;
+		xmlNode* _tmp16_;
+		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_ = NULL;
+		gchar* _tmp18_;
 		xmlNode* _tmp19_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp20_ = NULL;
-		xmlNode* _tmp21_ = NULL;
-		xmlNode* _tmp22_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp20_;
+		xmlNode* _tmp21_;
+		xmlNode* _tmp22_;
 		gchar* url = NULL;
-		gchar* _tmp23_ = NULL;
-		PublishingRajceSession* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		PublishingRajceSession* _tmp26_ = NULL;
-		const gchar* _tmp27_ = 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;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4845,7 +4853,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 		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 4845 "RajcePublishing.c"
+#line 4853 "RajcePublishing.c"
 				goto __catch25_spit_publishing_publishing_error;
 			}
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4854,7 +4862,7 @@ 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 4854 "RajcePublishing.c"
+#line 4862 "RajcePublishing.c"
 		}
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = doc;
@@ -4876,7 +4884,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 			_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 4876 "RajcePublishing.c"
+#line 4884 "RajcePublishing.c"
 				goto __catch25_spit_publishing_publishing_error;
 			}
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4887,7 +4895,7 @@ 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 4887 "RajcePublishing.c"
+#line 4895 "RajcePublishing.c"
 		}
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
@@ -4909,7 +4917,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 4909 "RajcePublishing.c"
+#line 4917 "RajcePublishing.c"
 				goto __catch25_spit_publishing_publishing_error;
 			}
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4922,7 +4930,7 @@ 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 4922 "RajcePublishing.c"
+#line 4930 "RajcePublishing.c"
 		}
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
@@ -4946,7 +4954,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
 		_g_free0 (sessionToken);
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4946 "RajcePublishing.c"
+#line 4954 "RajcePublishing.c"
 	}
 	goto __finally25;
 	__catch25_spit_publishing_publishing_error:
@@ -4960,7 +4968,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 4960 "RajcePublishing.c"
+#line 4968 "RajcePublishing.c"
 	}
 	__finally25:
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4971,11 +4979,11 @@ 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 4971 "RajcePublishing.c"
+#line 4979 "RajcePublishing.c"
 	}
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_close_album (self);
-#line 4975 "RajcePublishing.c"
+#line 4983 "RajcePublishing.c"
 }
 
 
@@ -4983,10 +4991,10 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _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"
@@ -5007,7 +5015,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingR
 	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 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_close_album (self);
-#line 5007 "RajcePublishing.c"
+#line 5015 "RajcePublishing.c"
 }
 
 
@@ -5017,25 +5025,25 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingR
 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 5017 "RajcePublishing.c"
+#line 5025 "RajcePublishing.c"
 }
 
 
 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 5024 "RajcePublishing.c"
+#line 5032 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingRajceCloseAlbumTransaction* close_album_trans = NULL;
-	PublishingRajceSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingRajceCloseAlbumTransaction* _tmp4_ = NULL;
-	PublishingRajceCloseAlbumTransaction* _tmp5_ = NULL;
+	PublishingRajceSession* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRajceCloseAlbumTransaction* _tmp4_;
+	PublishingRajceCloseAlbumTransaction* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -5063,7 +5071,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 5063 "RajcePublishing.c"
+#line 5071 "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_);
@@ -5071,7 +5079,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 5071 "RajcePublishing.c"
+#line 5079 "RajcePublishing.c"
 				goto __catch26_spit_publishing_publishing_error;
 			}
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5082,14 +5090,14 @@ 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 5082 "RajcePublishing.c"
+#line 5090 "RajcePublishing.c"
 		}
 	}
 	goto __finally26;
 	__catch26_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5102,7 +5110,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 5102 "RajcePublishing.c"
+#line 5110 "RajcePublishing.c"
 	}
 	__finally26:
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5115,11 +5123,11 @@ 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 5115 "RajcePublishing.c"
+#line 5123 "RajcePublishing.c"
 	}
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (close_album_trans);
-#line 5119 "RajcePublishing.c"
+#line 5127 "RajcePublishing.c"
 }
 
 
@@ -5127,13 +5135,13 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
      * Event triggered when the close album completes successfully.
      */
 static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	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));
@@ -5163,26 +5171,26 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 	g_debug ("RajcePublishing.vala:657: RajcePlugin: close album: %s", _tmp6_);
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp6_);
-#line 5163 "RajcePublishing.c"
+#line 5171 "RajcePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp11_;
 		xmlNode* response = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
 		xmlNode* _tmp14_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp15_ = NULL;
-		xmlNode* _tmp16_ = NULL;
-		xmlNode* _tmp17_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp15_;
+		xmlNode* _tmp16_;
+		xmlNode* _tmp17_;
 		gchar* sessionToken = NULL;
-		gchar* _tmp18_ = NULL;
-		PublishingRajceSession* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		PublishingRajceSession* _tmp21_ = NULL;
+		gchar* _tmp18_;
+		PublishingRajceSession* _tmp19_;
+		const gchar* _tmp20_;
+		PublishingRajceSession* _tmp21_;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = txn;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5201,7 +5209,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 		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 5201 "RajcePublishing.c"
+#line 5209 "RajcePublishing.c"
 				goto __catch27_spit_publishing_publishing_error;
 			}
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5210,7 +5218,7 @@ 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 5210 "RajcePublishing.c"
+#line 5218 "RajcePublishing.c"
 		}
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = doc;
@@ -5232,7 +5240,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 			_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 5232 "RajcePublishing.c"
+#line 5240 "RajcePublishing.c"
 				goto __catch27_spit_publishing_publishing_error;
 			}
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5243,7 +5251,7 @@ 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 5243 "RajcePublishing.c"
+#line 5251 "RajcePublishing.c"
 		}
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
@@ -5263,13 +5271,13 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 		_g_free0 (sessionToken);
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5263 "RajcePublishing.c"
+#line 5271 "RajcePublishing.c"
 	}
 	goto __finally27;
 	__catch27_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp22_ = NULL;
+		GError* _tmp22_;
 #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"
@@ -5284,7 +5292,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
 		_g_error_free0 (err);
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 5284 "RajcePublishing.c"
+#line 5292 "RajcePublishing.c"
 	}
 	__finally27:
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5295,11 +5303,11 @@ 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 5295 "RajcePublishing.c"
+#line 5303 "RajcePublishing.c"
 	}
 #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_success_pane (self);
-#line 5299 "RajcePublishing.c"
+#line 5307 "RajcePublishing.c"
 }
 
 
@@ -5307,10 +5315,10 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
      * 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_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _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"
@@ -5331,7 +5339,7 @@ static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRaj
 	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 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_success_pane (self);
-#line 5331 "RajcePublishing.c"
+#line 5339 "RajcePublishing.c"
 }
 
 
@@ -5340,9 +5348,9 @@ static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRaj
      */
 static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	SpitPublishingPluginHost* _tmp11_ = NULL;
+	gboolean _tmp1_;
+	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));
@@ -5352,10 +5360,10 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
 	_tmp1_ = publishing_rajce_rajce_publisher_get_show_album (self);
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1_) {
-#line 5352 "RajcePublishing.c"
-		PublishingRajceSession* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+#line 5360 "RajcePublishing.c"
+		PublishingRajceSession* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp2_ = self->priv->session;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5366,21 +5374,21 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
 		_tmp0_ = _tmp4_ != NULL;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (_tmp4_);
-#line 5366 "RajcePublishing.c"
+#line 5374 "RajcePublishing.c"
 	} else {
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 5370 "RajcePublishing.c"
+#line 5378 "RajcePublishing.c"
 	}
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp0_) {
-#line 5374 "RajcePublishing.c"
+#line 5382 "RajcePublishing.c"
 		{
-			PublishingRajceSession* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
+			PublishingRajceSession* _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;
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5401,7 +5409,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
 			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 5401 "RajcePublishing.c"
+#line 5409 "RajcePublishing.c"
 					goto __catch28_g_spawn_error;
 				}
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5410,7 +5418,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 5410 "RajcePublishing.c"
+#line 5418 "RajcePublishing.c"
 			}
 		}
 		goto __finally28;
@@ -5423,7 +5431,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 5423 "RajcePublishing.c"
+#line 5431 "RajcePublishing.c"
 		}
 		__finally28:
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5434,7 +5442,7 @@ 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 5434 "RajcePublishing.c"
+#line 5442 "RajcePublishing.c"
 		}
 	}
 #line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5445,7 +5453,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
 	_tmp11_ = self->priv->host;
 #line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp11_);
-#line 5445 "RajcePublishing.c"
+#line 5453 "RajcePublishing.c"
 }
 
 
@@ -5453,7 +5461,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
      * Helper event to handle network errors.
      */
 static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	GError* _tmp0_ = NULL;
+	GError* _tmp0_;
 #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"
@@ -5464,7 +5472,7 @@ static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRa
 	_tmp0_ = err;
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_rajce_publisher_do_show_error (self, _tmp0_);
-#line 5464 "RajcePublishing.c"
+#line 5472 "RajcePublishing.c"
 }
 
 
@@ -5473,14 +5481,13 @@ static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRa
      */
 static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self, GError* e) {
 	gchar* error_type = NULL;
-	gchar* _tmp0_ = NULL;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GError* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
+	gchar* _tmp0_;
+	GError* _tmp1_;
+	const gchar* _tmp14_;
+	GError* _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
 #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"
@@ -5499,97 +5506,97 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce
 		_g_free0 (error_type);
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return;
-#line 5499 "RajcePublishing.c"
+#line 5506 "RajcePublishing.c"
 	} else {
-		GError* _tmp2_ = NULL;
+		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 5506 "RajcePublishing.c"
-			gchar* _tmp3_ = NULL;
+#line 5513 "RajcePublishing.c"
+			gchar* _tmp3_;
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp3_ = 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 5514 "RajcePublishing.c"
+#line 5521 "RajcePublishing.c"
 		} else {
-			GError* _tmp4_ = NULL;
+			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 5521 "RajcePublishing.c"
-				gchar* _tmp5_ = NULL;
+#line 5528 "RajcePublishing.c"
+				gchar* _tmp5_;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp5_ = 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 5529 "RajcePublishing.c"
+#line 5536 "RajcePublishing.c"
 			} else {
-				GError* _tmp6_ = NULL;
+				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 5536 "RajcePublishing.c"
-					gchar* _tmp7_ = NULL;
+#line 5543 "RajcePublishing.c"
+					gchar* _tmp7_;
 #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp7_ = 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 5544 "RajcePublishing.c"
+#line 5551 "RajcePublishing.c"
 				} else {
-					GError* _tmp8_ = NULL;
+					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 5551 "RajcePublishing.c"
-						gchar* _tmp9_ = NULL;
+#line 5558 "RajcePublishing.c"
+						gchar* _tmp9_;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 						_tmp9_ = 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 5559 "RajcePublishing.c"
+#line 5566 "RajcePublishing.c"
 					} else {
-						GError* _tmp10_ = NULL;
+						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 5566 "RajcePublishing.c"
-							gchar* _tmp11_ = NULL;
+#line 5573 "RajcePublishing.c"
+							gchar* _tmp11_;
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 							_tmp11_ = 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 5574 "RajcePublishing.c"
+#line 5581 "RajcePublishing.c"
 						} else {
-							GError* _tmp12_ = NULL;
+							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 5581 "RajcePublishing.c"
-								gchar* _tmp13_ = NULL;
+#line 5588 "RajcePublishing.c"
+								gchar* _tmp13_;
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 								_tmp13_ = 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 5589 "RajcePublishing.c"
+#line 5596 "RajcePublishing.c"
 							}
 						}
 					}
@@ -5612,12 +5619,10 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp18_);
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp19_ = _ ("An error message occurred when publishing to Rajce. Please try again.");
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_do_show_error_message (self, _tmp19_);
+	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 5617 "RajcePublishing.c"
+#line 5622 "RajcePublishing.c"
 }
 
 
@@ -5625,8 +5630,8 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce
      * Action to display an error message to the user.
      */
 static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self, const gchar* message) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -5639,7 +5644,7 @@ static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRa
 	_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 5639 "RajcePublishing.c"
+#line 5644 "RajcePublishing.c"
 }
 
 
@@ -5650,7 +5655,7 @@ static void publishing_rajce_rajce_publisher_class_init (PublishingRajceRajcePub
 	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 5650 "RajcePublishing.c"
+#line 5655 "RajcePublishing.c"
 }
 
 
@@ -5658,14 +5663,14 @@ static void publishing_rajce_rajce_publisher_spit_publishing_publisher_interface
 #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"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rajce_rajce_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_get_service;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_rajce_rajce_publisher_real_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_is_running;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_rajce_rajce_publisher_real_start;
+	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 5665 "RajcePublishing.c"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_stop;
+#line 5670 "RajcePublishing.c"
 }
 
 
@@ -5676,6 +5681,10 @@ static void publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajce
 	self->priv->host = NULL;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->progress_reporter = NULL;
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->service = NULL;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5690,11 +5699,11 @@ 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 5690 "RajcePublishing.c"
+#line 5699 "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);
@@ -5718,7 +5727,7 @@ 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 5718 "RajcePublishing.c"
+#line 5727 "RajcePublishing.c"
 }
 
 
@@ -5738,20 +5747,20 @@ 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* self = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	gint _tmp13_ = 0;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	const 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"
@@ -5822,26 +5831,26 @@ PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint
 	self->photoCount = _tmp13_;
 #line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 5822 "RajcePublishing.c"
+#line 5831 "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) {
 #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 5829 "RajcePublishing.c"
+#line 5838 "RajcePublishing.c"
 }
 
 
 gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingRajceAlbum* b) {
 	gint result = 0;
 	gboolean _tmp0_ = FALSE;
-	PublishingRajceAlbum* _tmp1_ = NULL;
-	PublishingRajceAlbum* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	PublishingRajceAlbum* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	PublishingRajceAlbum* _tmp1_;
+	PublishingRajceAlbum* _tmp9_;
+	const gchar* _tmp10_;
+	PublishingRajceAlbum* _tmp11_;
+	const gchar* _tmp12_;
+	gint _tmp13_;
 #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"
@@ -5850,17 +5859,17 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR
 	_tmp1_ = a;
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1_ == NULL) {
-#line 5850 "RajcePublishing.c"
-		PublishingRajceAlbum* _tmp2_ = NULL;
+#line 5859 "RajcePublishing.c"
+		PublishingRajceAlbum* _tmp2_;
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp2_ = b;
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 5856 "RajcePublishing.c"
+#line 5865 "RajcePublishing.c"
 	} else {
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 5860 "RajcePublishing.c"
+#line 5869 "RajcePublishing.c"
 	}
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp0_) {
@@ -5868,25 +5877,25 @@ 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 5868 "RajcePublishing.c"
+#line 5877 "RajcePublishing.c"
 	} else {
 		gboolean _tmp3_ = FALSE;
-		PublishingRajceAlbum* _tmp4_ = NULL;
+		PublishingRajceAlbum* _tmp4_;
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = a;
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (_tmp4_ == NULL) {
-#line 5876 "RajcePublishing.c"
-			PublishingRajceAlbum* _tmp5_ = NULL;
+#line 5885 "RajcePublishing.c"
+			PublishingRajceAlbum* _tmp5_;
 #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 5882 "RajcePublishing.c"
+#line 5891 "RajcePublishing.c"
 		} else {
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp3_ = FALSE;
-#line 5886 "RajcePublishing.c"
+#line 5895 "RajcePublishing.c"
 		}
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (_tmp3_) {
@@ -5894,25 +5903,25 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR
 			result = 1;
 #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return result;
-#line 5894 "RajcePublishing.c"
+#line 5903 "RajcePublishing.c"
 		} else {
 			gboolean _tmp6_ = FALSE;
-			PublishingRajceAlbum* _tmp7_ = NULL;
+			PublishingRajceAlbum* _tmp7_;
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp7_ = a;
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_tmp7_ != NULL) {
-#line 5902 "RajcePublishing.c"
-				PublishingRajceAlbum* _tmp8_ = NULL;
+#line 5911 "RajcePublishing.c"
+				PublishingRajceAlbum* _tmp8_;
 #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 5908 "RajcePublishing.c"
+#line 5917 "RajcePublishing.c"
 			} else {
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp6_ = FALSE;
-#line 5912 "RajcePublishing.c"
+#line 5921 "RajcePublishing.c"
 			}
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_tmp6_) {
@@ -5920,7 +5929,7 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR
 				result = -1;
 #line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				return result;
-#line 5920 "RajcePublishing.c"
+#line 5929 "RajcePublishing.c"
 			}
 		}
 	}
@@ -5938,14 +5947,14 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR
 	result = _tmp13_;
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 5938 "RajcePublishing.c"
+#line 5947 "RajcePublishing.c"
 }
 
 
 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 5945 "RajcePublishing.c"
+#line 5954 "RajcePublishing.c"
 }
 
 
@@ -5954,7 +5963,7 @@ static void publishing_rajce_value_album_free_value (GValue* value) {
 	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 5954 "RajcePublishing.c"
+#line 5963 "RajcePublishing.c"
 	}
 }
 
@@ -5964,11 +5973,11 @@ static void publishing_rajce_value_album_copy_value (const GValue* src_value, GV
 	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 5964 "RajcePublishing.c"
+#line 5973 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5968 "RajcePublishing.c"
+#line 5977 "RajcePublishing.c"
 	}
 }
 
@@ -5976,66 +5985,66 @@ static void publishing_rajce_value_album_copy_value (const GValue* src_value, GV
 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 5976 "RajcePublishing.c"
+#line 5985 "RajcePublishing.c"
 }
 
 
 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 5983 "RajcePublishing.c"
-		PublishingRajceAlbum* object;
+#line 5992 "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 5990 "RajcePublishing.c"
+#line 5999 "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 5994 "RajcePublishing.c"
+#line 6003 "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 5998 "RajcePublishing.c"
+#line 6007 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6002 "RajcePublishing.c"
+#line 6011 "RajcePublishing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 6006 "RajcePublishing.c"
+#line 6015 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingRajceAlbum** object_p;
+	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 6017 "RajcePublishing.c"
+#line 6026 "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 6023 "RajcePublishing.c"
+#line 6032 "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 6027 "RajcePublishing.c"
+#line 6036 "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 6031 "RajcePublishing.c"
+#line 6040 "RajcePublishing.c"
 	}
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 6035 "RajcePublishing.c"
+#line 6044 "RajcePublishing.c"
 }
 
 
@@ -6049,7 +6058,7 @@ 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 6049 "RajcePublishing.c"
+#line 6058 "RajcePublishing.c"
 }
 
 
@@ -6058,12 +6067,12 @@ gpointer publishing_rajce_value_get_album (const GValue* value) {
 	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 6058 "RajcePublishing.c"
+#line 6067 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_value_set_album (GValue* value, gpointer v_object) {
-	PublishingRajceAlbum* old;
+	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));
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6078,23 +6087,23 @@ 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 6078 "RajcePublishing.c"
+#line 6087 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6082 "RajcePublishing.c"
+#line 6091 "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 6088 "RajcePublishing.c"
+#line 6097 "RajcePublishing.c"
 	}
 }
 
 
 void publishing_rajce_value_take_album (GValue* value, gpointer v_object) {
-	PublishingRajceAlbum* old;
+	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));
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6107,17 +6116,17 @@ 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 6107 "RajcePublishing.c"
+#line 6116 "RajcePublishing.c"
 	} else {
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6111 "RajcePublishing.c"
+#line 6120 "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 6117 "RajcePublishing.c"
+#line 6126 "RajcePublishing.c"
 	}
 }
 
@@ -6127,18 +6136,18 @@ static void publishing_rajce_album_class_init (PublishingRajceAlbumClass * klass
 	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 6127 "RajcePublishing.c"
+#line 6136 "RajcePublishing.c"
 }
 
 
 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 6134 "RajcePublishing.c"
+#line 6143 "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);
@@ -6154,7 +6163,7 @@ 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 6154 "RajcePublishing.c"
+#line 6163 "RajcePublishing.c"
 }
 
 
@@ -6173,18 +6182,18 @@ GType publishing_rajce_album_get_type (void) {
 
 
 gpointer publishing_rajce_album_ref (gpointer instance) {
-	PublishingRajceAlbum* self;
+	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 6179 "RajcePublishing.c"
+#line 6188 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_album_unref (gpointer instance) {
-	PublishingRajceAlbum* self;
+	PublishingRajceAlbum * self;
 	self = instance;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -6192,20 +6201,20 @@ 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 6192 "RajcePublishing.c"
+#line 6201 "RajcePublishing.c"
 	}
 }
 
 
 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_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingRajcePublishingParameters* _tmp2_ = NULL;
-	PublishingRajcePublishingParameters* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingRajcePublishingParameters* _tmp2_;
+	PublishingRajcePublishingParameters* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #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"
@@ -6238,27 +6247,27 @@ PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type,
 	self->priv->url = _tmp5_;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 6238 "RajcePublishing.c"
+#line 6247 "RajcePublishing.c"
 }
 
 
 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 6245 "RajcePublishing.c"
+#line 6254 "RajcePublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingRajceUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingRajceSession* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRajcePublishingParameters* _tmp3_ = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	PublishingRajceAddPhotoTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRajceSession* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRajcePublishingParameters* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
+	PublishingRajceAddPhotoTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
 #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"
@@ -6283,7 +6292,7 @@ static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_t
 	result = _tmp6_;
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6283 "RajcePublishing.c"
+#line 6292 "RajcePublishing.c"
 }
 
 
@@ -6295,19 +6304,19 @@ static void publishing_rajce_uploader_class_init (PublishingRajceUploaderClass *
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	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 6296 "RajcePublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rajce_uploader_real_create_transaction;
+#line 6305 "RajcePublishing.c"
 }
 
 
 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 6303 "RajcePublishing.c"
+#line 6312 "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);
@@ -6317,7 +6326,7 @@ 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 6317 "RajcePublishing.c"
+#line 6326 "RajcePublishing.c"
 }
 
 
@@ -6348,27 +6357,27 @@ 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) {
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_on_user_changed ((PublishingRajceAuthenticationPane*) self);
-#line 6348 "RajcePublishing.c"
+#line 6357 "RajcePublishing.c"
 }
 
 
 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 6355 "RajcePublishing.c"
+#line 6364 "RajcePublishing.c"
 }
 
 
 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 6362 "RajcePublishing.c"
+#line 6371 "RajcePublishing.c"
 }
 
 
 PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) {
 	PublishingRajceAuthenticationPane * self = NULL;
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (publisher), NULL);
@@ -6382,72 +6391,68 @@ 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 6382 "RajcePublishing.c"
+#line 6391 "RajcePublishing.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GtkBuilder* _tmp3_ = NULL;
+		GtkBuilder* _tmp1_;
+		GtkBuilder* _tmp2_;
+		GtkBuilder* _tmp3_;
 		GtkBox* content = NULL;
-		GtkBuilder* _tmp4_ = NULL;
-		GObject* _tmp5_ = NULL;
-		GtkBox* _tmp6_ = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GtkBox* _tmp6_;
 		GtkLabel* message_label = NULL;
-		GtkBuilder* _tmp7_ = NULL;
-		GObject* _tmp8_ = NULL;
-		GtkLabel* _tmp9_ = NULL;
-		PublishingRajceAuthenticationPaneMode _tmp10_ = 0;
-		GtkBuilder* _tmp18_ = NULL;
-		GObject* _tmp19_ = NULL;
-		GtkEntry* _tmp20_ = NULL;
+		GtkBuilder* _tmp7_;
+		GObject* _tmp8_;
+		GtkLabel* _tmp9_;
+		PublishingRajceAuthenticationPaneMode _tmp10_;
+		GtkBuilder* _tmp17_;
+		GObject* _tmp18_;
+		GtkEntry* _tmp19_;
 		gchar* persistent_username = NULL;
-		PublishingRajceRajcePublisher* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		GtkBuilder* _tmp26_ = NULL;
-		GObject* _tmp27_ = NULL;
-		GtkEntry* _tmp28_ = NULL;
+		PublishingRajceRajcePublisher* _tmp20_;
+		gchar* _tmp21_;
+		const gchar* _tmp22_;
+		GtkBuilder* _tmp25_;
+		GObject* _tmp26_;
+		GtkEntry* _tmp27_;
 		gchar* persistent_token = NULL;
-		PublishingRajceRajcePublisher* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		GtkBuilder* _tmp34_ = NULL;
-		GObject* _tmp35_ = NULL;
-		GtkCheckButton* _tmp36_ = NULL;
-		GtkCheckButton* _tmp37_ = NULL;
-		PublishingRajceRajcePublisher* _tmp38_ = NULL;
-		gboolean _tmp39_ = FALSE;
-		GtkBuilder* _tmp40_ = NULL;
-		GObject* _tmp41_ = NULL;
-		GtkButton* _tmp42_ = 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_;
 		GtkLabel* label2 = NULL;
-		GtkBuilder* _tmp43_ = NULL;
-		GObject* _tmp44_ = NULL;
-		GtkLabel* _tmp45_ = NULL;
+		GtkBuilder* _tmp42_;
+		GObject* _tmp43_;
+		GtkLabel* _tmp44_;
 		GtkLabel* label3 = NULL;
-		GtkBuilder* _tmp46_ = NULL;
-		GObject* _tmp47_ = NULL;
-		GtkLabel* _tmp48_ = NULL;
-		GtkLabel* _tmp49_ = NULL;
-		const gchar* _tmp50_ = NULL;
-		GtkLabel* _tmp51_ = NULL;
-		const gchar* _tmp52_ = NULL;
-		GtkCheckButton* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
-		GtkButton* _tmp55_ = NULL;
-		const gchar* _tmp56_ = NULL;
-		GtkEntry* _tmp57_ = NULL;
-		GtkEntry* _tmp58_ = NULL;
-		GtkButton* _tmp59_ = NULL;
-		GtkBox* _tmp60_ = NULL;
-		GtkContainer* _tmp61_ = NULL;
-		GtkContainer* _tmp62_ = NULL;
-		GtkBox* _tmp63_ = NULL;
-		GtkBox* _tmp64_ = NULL;
-		GtkBox* _tmp65_ = NULL;
-		PublishingRajceRajcePublisher* _tmp66_ = NULL;
-		SpitPublishingPluginHost* _tmp67_ = NULL;
-		SpitPublishingPluginHost* _tmp68_ = NULL;
-		GtkButton* _tmp69_ = NULL;
+		GtkBuilder* _tmp45_;
+		GObject* _tmp46_;
+		GtkLabel* _tmp47_;
+		GtkLabel* _tmp48_;
+		GtkLabel* _tmp49_;
+		GtkCheckButton* _tmp50_;
+		GtkButton* _tmp51_;
+		GtkEntry* _tmp52_;
+		GtkEntry* _tmp53_;
+		GtkButton* _tmp54_;
+		GtkBox* _tmp55_;
+		GtkContainer* _tmp56_;
+		GtkContainer* _tmp57_;
+		GtkBox* _tmp58_;
+		GtkBox* _tmp59_;
+		GtkBox* _tmp60_;
+		PublishingRajceRajcePublisher* _tmp61_;
+		SpitPublishingPluginHost* _tmp62_;
+		SpitPublishingPluginHost* _tmp63_;
+		GtkButton* _tmp64_;
 #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"
@@ -6460,7 +6465,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 6460 "RajcePublishing.c"
+#line 6465 "RajcePublishing.c"
 			goto __catch29_g_error;
 		}
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6489,10 +6494,10 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		switch (_tmp10_) {
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO:
-#line 6489 "RajcePublishing.c"
+#line 6494 "RajcePublishing.c"
 			{
-				GtkLabel* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+				GtkLabel* _tmp11_;
+				const gchar* _tmp12_;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp11_ = message_label;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6501,216 +6506,205 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 				gtk_label_set_text (_tmp11_, _tmp12_);
 #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				break;
-#line 6501 "RajcePublishing.c"
+#line 6506 "RajcePublishing.c"
 			}
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 6505 "RajcePublishing.c"
+#line 6510 "RajcePublishing.c"
 			{
-				GtkLabel* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
+				GtkLabel* _tmp13_;
+				const gchar* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp13_ = message_label;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp14_ = _ ("Invalid User Email or Password");
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp15_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+				_tmp14_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp16_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_);
+				_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Email or Password"), _tmp14_);
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_tmp17_ = _tmp16_;
+				_tmp16_ = _tmp15_;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				gtk_label_set_markup (_tmp13_, _tmp17_);
+				gtk_label_set_markup (_tmp13_, _tmp16_);
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-				_g_free0 (_tmp17_);
+				_g_free0 (_tmp16_);
 #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				break;
-#line 6528 "RajcePublishing.c"
+#line 6530 "RajcePublishing.c"
 			}
 			default:
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			break;
-#line 6533 "RajcePublishing.c"
+#line 6535 "RajcePublishing.c"
 		}
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp18_ = self->priv->builder;
+		_tmp17_ = self->priv->builder;
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp19_ = gtk_builder_get_object (_tmp18_, "username_entry");
+		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp19_) : NULL);
+		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : 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 = _tmp20_;
+		self->priv->username_entry = _tmp19_;
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp21_ = publisher;
+		_tmp20_ = publisher;
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp22_ = publishing_rajce_rajce_publisher_get_username (_tmp21_);
+		_tmp21_ = publishing_rajce_rajce_publisher_get_username (_tmp20_);
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		persistent_username = _tmp22_;
+		persistent_username = _tmp21_;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp23_ = persistent_username;
+		_tmp22_ = persistent_username;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp23_ != NULL) {
-#line 6555 "RajcePublishing.c"
-			GtkEntry* _tmp24_ = NULL;
-			const gchar* _tmp25_ = NULL;
+		if (_tmp22_ != NULL) {
+#line 6557 "RajcePublishing.c"
+			GtkEntry* _tmp23_;
+			const gchar* _tmp24_;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp24_ = self->priv->username_entry;
+			_tmp23_ = self->priv->username_entry;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp25_ = persistent_username;
+			_tmp24_ = persistent_username;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			gtk_entry_set_text (_tmp24_, _tmp25_);
-#line 6564 "RajcePublishing.c"
+			gtk_entry_set_text (_tmp23_, _tmp24_);
+#line 6566 "RajcePublishing.c"
 		}
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp26_ = self->priv->builder;
+		_tmp25_ = self->priv->builder;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp27_ = gtk_builder_get_object (_tmp26_, "password_entry");
+		_tmp26_ = gtk_builder_get_object (_tmp25_, "password_entry");
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp27_) : NULL);
+		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : 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 = _tmp28_;
+		self->priv->password_entry = _tmp27_;
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp29_ = publisher;
+		_tmp28_ = publisher;
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp30_ = publishing_rajce_rajce_publisher_get_token (_tmp29_);
+		_tmp29_ = publishing_rajce_rajce_publisher_get_token (_tmp28_);
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		persistent_token = _tmp30_;
+		persistent_token = _tmp29_;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp31_ = persistent_token;
+		_tmp30_ = persistent_token;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		if (_tmp31_ != NULL) {
-#line 6586 "RajcePublishing.c"
-			GtkEntry* _tmp32_ = NULL;
-			const gchar* _tmp33_ = NULL;
+		if (_tmp30_ != NULL) {
+#line 6588 "RajcePublishing.c"
+			GtkEntry* _tmp31_;
+			const gchar* _tmp32_;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp32_ = self->priv->password_entry;
+			_tmp31_ = self->priv->password_entry;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			_tmp33_ = persistent_token;
+			_tmp32_ = persistent_token;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-			gtk_entry_set_text (_tmp32_, _tmp33_);
+			gtk_entry_set_text (_tmp31_, _tmp32_);
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			self->priv->crypt = FALSE;
-#line 6597 "RajcePublishing.c"
+#line 6599 "RajcePublishing.c"
 		} else {
 #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			self->priv->crypt = TRUE;
-#line 6601 "RajcePublishing.c"
+#line 6603 "RajcePublishing.c"
 		}
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp34_ = self->priv->builder;
+		_tmp33_ = self->priv->builder;
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp35_ = gtk_builder_get_object (_tmp34_, "remember_checkbutton");
+		_tmp34_ = gtk_builder_get_object (_tmp33_, "remember_checkbutton");
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp35_) : NULL);
+		_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp34_) : 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 = _tmp36_;
+		self->priv->remember_checkbutton = _tmp35_;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp37_ = self->priv->remember_checkbutton;
+		_tmp36_ = self->priv->remember_checkbutton;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp38_ = publisher;
+		_tmp37_ = publisher;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp39_ = publishing_rajce_rajce_publisher_get_remember (_tmp38_);
+		_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 (_tmp37_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp39_);
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp38_);
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp40_ = self->priv->builder;
+		_tmp39_ = self->priv->builder;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp41_ = gtk_builder_get_object (_tmp40_, "login_button");
+		_tmp40_ = gtk_builder_get_object (_tmp39_, "login_button");
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, gtk_button_get_type ()) ? ((GtkButton*) _tmp41_) : NULL);
+		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_button_get_type ()) ? ((GtkButton*) _tmp40_) : 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 = _tmp42_;
+		self->priv->login_button = _tmp41_;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp43_ = self->priv->builder;
+		_tmp42_ = self->priv->builder;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp44_ = gtk_builder_get_object (_tmp43_, "label2");
+		_tmp43_ = gtk_builder_get_object (_tmp42_, "label2");
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp44_) : NULL);
+		_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp43_) : NULL);
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		label2 = _tmp45_;
+		label2 = _tmp44_;
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp46_ = self->priv->builder;
+		_tmp45_ = self->priv->builder;
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp47_ = gtk_builder_get_object (_tmp46_, "label3");
+		_tmp46_ = gtk_builder_get_object (_tmp45_, "label3");
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp47_) : NULL);
+		_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp46_) : NULL);
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		label3 = _tmp48_;
+		label3 = _tmp47_;
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp49_ = label2;
+		_tmp48_ = label2;
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp50_ = _ ("_Email address");
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp49_, _tmp50_);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp51_ = label3;
+		gtk_label_set_label (_tmp48_, _ ("_Email address"));
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp52_ = _ ("_Password");
+		_tmp49_ = label3;
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp51_, _tmp52_);
+		gtk_label_set_label (_tmp49_, _ ("_Password"));
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp53_ = self->priv->remember_checkbutton;
+		_tmp50_ = self->priv->remember_checkbutton;
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp54_ = _ ("_Remember");
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_button_get_type (), GtkButton), _tmp54_);
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp55_ = self->priv->login_button;
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_button_get_type (), GtkButton), _ ("_Remember"));
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp56_ = _ ("Log in");
+		_tmp51_ = self->priv->login_button;
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (_tmp55_, _tmp56_);
+		gtk_button_set_label (_tmp51_, _ ("Log in"));
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp57_ = self->priv->username_entry;
+		_tmp52_ = 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 (_tmp57_, 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 (_tmp52_, GTK_TYPE_EDITABLE, 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"
-		_tmp58_ = self->priv->password_entry;
+		_tmp53_ = 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 (_tmp58_, 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 (_tmp53_, GTK_TYPE_EDITABLE, 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"
-		_tmp59_ = self->priv->login_button;
+		_tmp54_ = self->priv->login_button;
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (_tmp59_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp54_, "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"
-		_tmp60_ = content;
+		_tmp55_ = content;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp61_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
+		_tmp56_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp62_ = _tmp61_;
+		_tmp57_ = _tmp56_;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp63_ = content;
+		_tmp58_ = content;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_container_remove (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_remove (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp64_ = self->priv->pane_widget;
+		_tmp59_ = self->priv->pane_widget;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp65_ = content;
+		_tmp60_ = content;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget));
+		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"
-		_tmp66_ = publisher;
+		_tmp61_ = publisher;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp67_ = publishing_rajce_rajce_publisher_get_host (_tmp66_);
+		_tmp62_ = publishing_rajce_rajce_publisher_get_host (_tmp61_);
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp68_ = _tmp67_;
+		_tmp63_ = _tmp62_;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp69_ = self->priv->login_button;
+		_tmp64_ = self->priv->login_button;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget));
+		spit_publishing_plugin_host_set_dialog_default_widget (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_object_unref0 (_tmp68_);
+		_g_object_unref0 (_tmp63_);
 #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"
@@ -6723,27 +6717,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 6723 "RajcePublishing.c"
+#line 6717 "RajcePublishing.c"
 	}
 	goto __finally29;
 	__catch29_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp70_ = NULL;
-		const gchar* _tmp71_ = NULL;
+		GError* _tmp65_;
+		const gchar* _tmp66_;
 #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"
-		_tmp70_ = e;
+		_tmp65_ = e;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp71_ = _tmp70_->message;
+		_tmp66_ = _tmp65_->message;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp71_);
+		g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp66_);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (e);
-#line 6743 "RajcePublishing.c"
+#line 6737 "RajcePublishing.c"
 	}
 	__finally29:
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6754,25 +6748,25 @@ 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 6754 "RajcePublishing.c"
+#line 6748 "RajcePublishing.c"
 	}
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 6758 "RajcePublishing.c"
+#line 6752 "RajcePublishing.c"
 }
 
 
 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 6765 "RajcePublishing.c"
+#line 6759 "RajcePublishing.c"
 }
 
 
 GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self) {
 	GtkWidget* result = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkButton* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self), NULL);
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6783,21 +6777,21 @@ 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 6783 "RajcePublishing.c"
+#line 6777 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self) {
 	gchar* token = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GtkEntry* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkCheckButton* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	GtkEntry* _tmp6_;
+	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"
@@ -6812,9 +6806,9 @@ 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 6812 "RajcePublishing.c"
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 6806 "RajcePublishing.c"
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = token;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6823,7 +6817,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 6823 "RajcePublishing.c"
+#line 6817 "RajcePublishing.c"
 	}
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = self->priv->username_entry;
@@ -6836,10 +6830,10 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
 #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_by_name (self, "login", _tmp7_, _tmp8_, _tmp10_);
+	g_signal_emit (self, publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp7_, _tmp8_, _tmp10_);
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (token);
-#line 6839 "RajcePublishing.c"
+#line 6833 "RajcePublishing.c"
 }
 
 
@@ -6848,7 +6842,7 @@ static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajc
 	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 6848 "RajcePublishing.c"
+#line 6842 "RajcePublishing.c"
 }
 
 
@@ -6859,16 +6853,16 @@ static void publishing_rajce_authentication_pane_on_password_changed (Publishing
 	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 6859 "RajcePublishing.c"
+#line 6853 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self) {
 	gboolean _tmp0_ = FALSE;
-	GtkEntry* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	GtkButton* _tmp7_ = NULL;
+	GtkEntry* _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
+	GtkButton* _tmp7_;
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6879,10 +6873,10 @@ 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 6879 "RajcePublishing.c"
-		GtkEntry* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-		guint _tmp6_ = 0U;
+#line 6873 "RajcePublishing.c"
+		GtkEntry* _tmp4_;
+		guint _tmp5_;
+		guint _tmp6_;
 #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = self->priv->password_entry;
 #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6891,25 +6885,25 @@ 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 6891 "RajcePublishing.c"
+#line 6885 "RajcePublishing.c"
 	} else {
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 6895 "RajcePublishing.c"
+#line 6889 "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 6901 "RajcePublishing.c"
+#line 6895 "RajcePublishing.c"
 }
 
 
 static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingRajceAuthenticationPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6920,7 +6914,7 @@ 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 6920 "RajcePublishing.c"
+#line 6914 "RajcePublishing.c"
 }
 
 
@@ -6933,15 +6927,15 @@ 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 6933 "RajcePublishing.c"
+#line 6927 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingRajceAuthenticationPane * self;
-	GtkEntry* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	GtkEntry* _tmp1_;
+	GtkButton* _tmp2_;
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6958,7 +6952,7 @@ 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 6958 "RajcePublishing.c"
+#line 6952 "RajcePublishing.c"
 }
 
 
@@ -6966,7 +6960,7 @@ static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitP
 	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 6966 "RajcePublishing.c"
+#line 6960 "RajcePublishing.c"
 }
 
 
@@ -6985,27 +6979,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 6985 "RajcePublishing.c"
+#line 6979 "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 6991 "RajcePublishing.c"
+#line 6985 "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 6997 "RajcePublishing.c"
+#line 6991 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuthenticationPaneClass * klass) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7013,20 +7005,16 @@ static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuth
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rajce_authentication_pane_finalize;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_new ("login", PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp0_ = _ ("Enter email and password associated with your Rajce account.");
+	publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("Enter email and password associated with your Rajce account."));
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_authentication_pane_INTRO_MESSAGE = _tmp1_;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp2_ = _ ("Invalid email and/or password. Please try again");
+	publishing_rajce_authentication_pane_INTRO_MESSAGE = _tmp0_;
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_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 = _tmp3_;
-#line 7026 "RajcePublishing.c"
+	publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
+#line 7014 "RajcePublishing.c"
 }
 
 
@@ -7034,14 +7022,14 @@ static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_int
 #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"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_get_widget;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_get_preferred_geometry;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_on_pane_installed;
+	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 7041 "RajcePublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_on_pane_uninstalled;
+#line 7029 "RajcePublishing.c"
 }
 
 
@@ -7052,11 +7040,11 @@ static void publishing_rajce_authentication_pane_instance_init (PublishingRajceA
 	self->priv->pane_widget = NULL;
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->crypt = TRUE;
-#line 7052 "RajcePublishing.c"
+#line 7040 "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);
@@ -7074,7 +7062,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 7074 "RajcePublishing.c"
+#line 7062 "RajcePublishing.c"
 }
 
 
@@ -7099,7 +7087,7 @@ GType publishing_rajce_authentication_pane_get_type (void) {
 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 7099 "RajcePublishing.c"
+#line 7087 "RajcePublishing.c"
 }
 
 
@@ -7110,66 +7098,66 @@ static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int
 	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 7110 "RajcePublishing.c"
-		PublishingRajceAlbum* _tmp0_ = NULL;
+#line 7098 "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 7116 "RajcePublishing.c"
+#line 7104 "RajcePublishing.c"
 	}
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 7120 "RajcePublishing.c"
+#line 7108 "RajcePublishing.c"
 }
 
 
 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 7127 "RajcePublishing.c"
+#line 7115 "RajcePublishing.c"
 }
 
 
 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 7134 "RajcePublishing.c"
+#line 7122 "RajcePublishing.c"
 }
 
 
 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 7141 "RajcePublishing.c"
+#line 7129 "RajcePublishing.c"
 }
 
 
 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 7148 "RajcePublishing.c"
+#line 7136 "RajcePublishing.c"
 }
 
 
 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 7155 "RajcePublishing.c"
+#line 7143 "RajcePublishing.c"
 }
 
 
 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_ = NULL;
-	gchar* _tmp1_ = NULL;
-	PublishingRajceAlbum** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PublishingRajceAlbum** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PublishingRajceRajcePublisher* _tmp4_ = NULL;
-	PublishingRajceRajcePublisher* _tmp5_ = NULL;
-	GtkBox* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	PublishingRajceAlbum** _tmp2_;
+	gint _tmp2__length1;
+	PublishingRajceAlbum** _tmp3_;
+	gint _tmp3__length1;
+	PublishingRajceRajcePublisher* _tmp4_;
+	PublishingRajceRajcePublisher* _tmp5_;
+	GtkBox* _tmp6_;
 	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);
@@ -7217,74 +7205,66 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 	_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 7217 "RajcePublishing.c"
+#line 7205 "RajcePublishing.c"
 	{
-		GtkBuilder* _tmp7_ = NULL;
-		GtkBuilder* _tmp8_ = NULL;
-		GtkBuilder* _tmp9_ = NULL;
-		GtkBuilder* _tmp10_ = NULL;
-		GObject* _tmp11_ = NULL;
-		GtkBox* _tmp12_ = NULL;
-		GtkBuilder* _tmp13_ = NULL;
-		GObject* _tmp14_ = NULL;
-		GtkLabel* _tmp15_ = NULL;
-		GtkBuilder* _tmp16_ = NULL;
-		GObject* _tmp17_ = NULL;
-		GtkLabel* _tmp18_ = NULL;
-		GtkBuilder* _tmp19_ = NULL;
-		GObject* _tmp20_ = NULL;
-		GtkRadioButton* _tmp21_ = NULL;
-		GtkBuilder* _tmp22_ = NULL;
-		GObject* _tmp23_ = NULL;
-		GtkComboBoxText* _tmp24_ = NULL;
-		GtkBuilder* _tmp25_ = NULL;
-		GObject* _tmp26_ = NULL;
-		GtkRadioButton* _tmp27_ = NULL;
-		GtkBuilder* _tmp28_ = NULL;
-		GObject* _tmp29_ = NULL;
-		GtkEntry* _tmp30_ = NULL;
-		GtkBuilder* _tmp31_ = NULL;
-		GObject* _tmp32_ = NULL;
-		GtkCheckButton* _tmp33_ = NULL;
-		GtkCheckButton* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
-		GtkBuilder* _tmp36_ = NULL;
-		GObject* _tmp37_ = NULL;
-		GtkCheckButton* _tmp38_ = NULL;
-		GtkBuilder* _tmp39_ = NULL;
-		GObject* _tmp40_ = NULL;
-		GtkButton* _tmp41_ = NULL;
-		GtkBuilder* _tmp42_ = NULL;
-		GObject* _tmp43_ = NULL;
-		GtkButton* _tmp44_ = NULL;
-		GtkCheckButton* _tmp45_ = NULL;
-		PublishingRajceRajcePublisher* _tmp46_ = NULL;
-		gboolean _tmp47_ = FALSE;
-		GtkCheckButton* _tmp48_ = NULL;
-		PublishingRajceRajcePublisher* _tmp49_ = NULL;
-		gboolean _tmp50_ = FALSE;
-		GtkLabel* _tmp51_ = NULL;
-		const gchar* _tmp52_ = NULL;
-		const gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		GtkLabel* _tmp56_ = NULL;
-		const gchar* _tmp57_ = NULL;
-		GtkRadioButton* _tmp58_ = NULL;
-		const gchar* _tmp59_ = NULL;
-		GtkRadioButton* _tmp60_ = NULL;
-		const gchar* _tmp61_ = NULL;
-		GtkCheckButton* _tmp62_ = NULL;
-		const gchar* _tmp63_ = NULL;
-		GtkButton* _tmp64_ = NULL;
-		const gchar* _tmp65_ = NULL;
-		GtkButton* _tmp66_ = NULL;
-		const gchar* _tmp67_ = NULL;
-		GtkRadioButton* _tmp68_ = NULL;
-		GtkRadioButton* _tmp69_ = NULL;
-		GtkEntry* _tmp70_ = NULL;
-		GtkButton* _tmp71_ = NULL;
-		GtkButton* _tmp72_ = NULL;
+		GtkBuilder* _tmp7_;
+		GtkBuilder* _tmp8_;
+		GtkBuilder* _tmp9_;
+		GtkBuilder* _tmp10_;
+		GObject* _tmp11_;
+		GtkBox* _tmp12_;
+		GtkBuilder* _tmp13_;
+		GObject* _tmp14_;
+		GtkLabel* _tmp15_;
+		GtkBuilder* _tmp16_;
+		GObject* _tmp17_;
+		GtkLabel* _tmp18_;
+		GtkBuilder* _tmp19_;
+		GObject* _tmp20_;
+		GtkRadioButton* _tmp21_;
+		GtkBuilder* _tmp22_;
+		GObject* _tmp23_;
+		GtkComboBoxText* _tmp24_;
+		GtkBuilder* _tmp25_;
+		GObject* _tmp26_;
+		GtkRadioButton* _tmp27_;
+		GtkBuilder* _tmp28_;
+		GObject* _tmp29_;
+		GtkEntry* _tmp30_;
+		GtkBuilder* _tmp31_;
+		GObject* _tmp32_;
+		GtkCheckButton* _tmp33_;
+		GtkCheckButton* _tmp34_;
+		GtkBuilder* _tmp35_;
+		GObject* _tmp36_;
+		GtkCheckButton* _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_;
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = gtk_builder_new ();
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7297,7 +7277,7 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 		gtk_builder_add_from_resource (_tmp8_, 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 7297 "RajcePublishing.c"
+#line 7277 "RajcePublishing.c"
 			goto __catch30_g_error;
 		}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7387,146 +7367,130 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp34_ = self->priv->hide_check;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp35_ = _ ("_Hide album");
-#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), _tmp35_);
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _ ("_Hide album"));
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp36_ = self->priv->builder;
+		_tmp35_ = self->priv->builder;
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp37_ = gtk_builder_get_object (_tmp36_, "show_check");
+		_tmp36_ = gtk_builder_get_object (_tmp35_, "show_check");
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_check_button_get_type (), GtkCheckButton));
+		_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, 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 = _tmp38_;
+		self->priv->show_check = _tmp37_;
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp39_ = self->priv->builder;
+		_tmp38_ = self->priv->builder;
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp40_ = gtk_builder_get_object (_tmp39_, "publish_button");
+		_tmp39_ = gtk_builder_get_object (_tmp38_, "publish_button");
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_button_get_type (), GtkButton));
+		_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, 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 = _tmp41_;
+		self->priv->publish_button = _tmp40_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp42_ = self->priv->builder;
+		_tmp41_ = self->priv->builder;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp43_ = gtk_builder_get_object (_tmp42_, "logout_button");
+		_tmp42_ = gtk_builder_get_object (_tmp41_, "logout_button");
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_button_get_type (), GtkButton));
+		_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, 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 = _tmp44_;
+		self->priv->logout_button = _tmp43_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp45_ = self->priv->hide_check;
+		_tmp44_ = self->priv->hide_check;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp46_ = publisher;
+		_tmp45_ = publisher;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp47_ = publishing_rajce_rajce_publisher_get_hide_album (_tmp46_);
+		_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 (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp47_);
+		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"
-		_tmp48_ = self->priv->show_check;
+		_tmp47_ = self->priv->show_check;
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp49_ = publisher;
+		_tmp48_ = publisher;
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp50_ = publishing_rajce_rajce_publisher_get_show_album (_tmp49_);
+		_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 (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp51_ = self->priv->login_identity_label;
+		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"
-		_tmp52_ = _ ("You are logged into Rajce as %s.");
+		_tmp50_ = self->priv->login_identity_label;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp53_ = username;
+		_tmp51_ = username;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp54_ = g_strdup_printf (_tmp52_, _tmp53_);
+		_tmp52_ = g_strdup_printf (_ ("You are logged into Rajce as %s."), _tmp51_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp55_ = _tmp54_;
+		_tmp53_ = _tmp52_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp51_, _tmp55_);
+		gtk_label_set_label (_tmp50_, _tmp53_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp55_);
+		_g_free0 (_tmp53_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp56_ = self->priv->publish_to_label;
+		_tmp54_ = self->priv->publish_to_label;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp57_ = _ ("Photos will appear in:");
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp56_, _tmp57_);
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp58_ = self->priv->use_existing_radio;
+		gtk_label_set_label (_tmp54_, _ ("Photos will appear in:"));
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp59_ = _ ("An _existing album:");
+		_tmp55_ = 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 (_tmp58_, gtk_button_get_type (), GtkButton), _tmp59_);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp60_ = self->priv->create_new_radio;
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_button_get_type (), GtkButton), _ ("An _existing album:"));
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp61_ = _ ("A _new album named:");
+		_tmp56_ = 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 (_tmp60_, gtk_button_get_type (), GtkButton), _tmp61_);
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), _ ("A _new album named:"));
 #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp62_ = self->priv->show_check;
+		_tmp57_ = self->priv->show_check;
 #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp63_ = _ ("Open target _album in browser");
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_button_get_type (), GtkButton), _tmp63_);
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp64_ = self->priv->publish_button;
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), _ ("Open target _album in browser"));
 #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp65_ = _ ("_Publish");
+		_tmp58_ = self->priv->publish_button;
 #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (_tmp64_, _tmp65_);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp66_ = self->priv->logout_button;
+		gtk_button_set_label (_tmp58_, _ ("_Publish"));
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp67_ = _ ("_Logout");
+		_tmp59_ = self->priv->logout_button;
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (_tmp66_, _tmp67_);
+		gtk_button_set_label (_tmp59_, _ ("_Logout"));
 #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp68_ = self->priv->use_existing_radio;
+		_tmp60_ = 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 (_tmp68_, 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 (_tmp60_, 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"
-		_tmp69_ = self->priv->create_new_radio;
+		_tmp61_ = 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 (_tmp69_, 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 (_tmp61_, 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"
-		_tmp70_ = self->priv->new_album_entry;
+		_tmp62_ = 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 (_tmp70_, 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 (_tmp62_, GTK_TYPE_EDITABLE, 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"
-		_tmp71_ = self->priv->logout_button;
+		_tmp63_ = self->priv->logout_button;
 #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp63_, "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"
-		_tmp72_ = self->priv->publish_button;
+		_tmp64_ = self->priv->publish_button;
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 7506 "RajcePublishing.c"
+		g_signal_connect_object (_tmp64_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 7470 "RajcePublishing.c"
 	}
 	goto __finally30;
 	__catch30_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp73_ = NULL;
-		const gchar* _tmp74_ = NULL;
+		GError* _tmp65_;
+		const gchar* _tmp66_;
 #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"
-		_tmp73_ = e;
+		_tmp65_ = e;
 #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp74_ = _tmp73_->message;
+		_tmp66_ = _tmp65_->message;
 #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp74_);
+		g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp66_);
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (e);
-#line 7526 "RajcePublishing.c"
+#line 7490 "RajcePublishing.c"
 	}
 	__finally30:
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7537,29 +7501,29 @@ 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 7537 "RajcePublishing.c"
+#line 7501 "RajcePublishing.c"
 	}
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 7541 "RajcePublishing.c"
+#line 7505 "RajcePublishing.c"
 }
 
 
 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 7548 "RajcePublishing.c"
+#line 7512 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self) {
 	gboolean show_album = FALSE;
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	PublishingRajceRajcePublisher* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GtkRadioButton* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
+	PublishingRajceRajcePublisher* _tmp2_;
+	gboolean _tmp3_;
+	GtkRadioButton* _tmp4_;
+	gboolean _tmp5_;
 #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"
@@ -7580,20 +7544,20 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish
 	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp5_) {
-#line 7580 "RajcePublishing.c"
+#line 7544 "RajcePublishing.c"
 		gchar* album_name = NULL;
-		GtkEntry* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		GtkEntry* _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
 		gboolean hide_album = FALSE;
-		GtkCheckButton* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
-		PublishingRajceRajcePublisher* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		const gchar* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
-		PublishingRajcePublishingParameters* _tmp15_ = NULL;
-		PublishingRajcePublishingParameters* _tmp16_ = NULL;
+		GtkCheckButton* _tmp9_;
+		gboolean _tmp10_;
+		PublishingRajceRajcePublisher* _tmp11_;
+		gboolean _tmp12_;
+		const gchar* _tmp13_;
+		gboolean _tmp14_;
+		PublishingRajcePublishingParameters* _tmp15_;
+		PublishingRajcePublishingParameters* _tmp16_;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp6_ = self->priv->new_album_entry;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7623,32 +7587,32 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp16_ = _tmp15_;
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_emit_by_name (self, "publish", _tmp16_);
+		g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp16_);
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rajce_publishing_parameters_unref0 (_tmp16_);
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (album_name);
-#line 7628 "RajcePublishing.c"
+#line 7592 "RajcePublishing.c"
 	} else {
 		gint id = 0;
-		PublishingRajceAlbum** _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
-		GtkComboBoxText* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		PublishingRajceAlbum* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
+		PublishingRajceAlbum** _tmp17_;
+		gint _tmp17__length1;
+		GtkComboBoxText* _tmp18_;
+		gint _tmp19_;
+		PublishingRajceAlbum* _tmp20_;
+		gint _tmp21_;
 		gchar* album_name = NULL;
-		PublishingRajceAlbum** _tmp22_ = NULL;
-		gint _tmp22__length1 = 0;
-		GtkComboBoxText* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
-		PublishingRajceAlbum* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		gint _tmp29_ = 0;
-		PublishingRajcePublishingParameters* _tmp30_ = NULL;
-		PublishingRajcePublishingParameters* _tmp31_ = NULL;
+		PublishingRajceAlbum** _tmp22_;
+		gint _tmp22__length1;
+		GtkComboBoxText* _tmp23_;
+		gint _tmp24_;
+		PublishingRajceAlbum* _tmp25_;
+		const gchar* _tmp26_;
+		gchar* _tmp27_;
+		const gchar* _tmp28_;
+		gint _tmp29_;
+		PublishingRajcePublishingParameters* _tmp30_;
+		PublishingRajcePublishingParameters* _tmp31_;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp17_ = self->priv->albums;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7688,21 +7652,21 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp31_ = _tmp30_;
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_emit_by_name (self, "publish", _tmp31_);
+		g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp31_);
 #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rajce_publishing_parameters_unref0 (_tmp31_);
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (album_name);
-#line 7693 "RajcePublishing.c"
+#line 7657 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkCheckButton* _tmp3_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	GtkEntry* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkCheckButton* _tmp3_;
 #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7723,15 +7687,15 @@ 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 7723 "RajcePublishing.c"
+#line 7687 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	GtkCheckButton* _tmp3_ = NULL;
+	GtkEntry* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	GtkEntry* _tmp2_;
+	GtkCheckButton* _tmp3_;
 #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7752,7 +7716,7 @@ 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 7752 "RajcePublishing.c"
+#line 7716 "RajcePublishing.c"
 }
 
 
@@ -7760,45 +7724,45 @@ static void publishing_rajce_publishing_options_pane_on_logout_clicked (Publishi
 #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_by_name (self, "logout");
-#line 7761 "RajcePublishing.c"
+	g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 7725 "RajcePublishing.c"
 }
 
 
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7784 "RajcePublishing.c"
+#line 7748 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self) {
 	gchar* album_name = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GtkButton* _tmp10_ = NULL;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gboolean _tmp7_;
+	GtkButton* _tmp10_;
 #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"
@@ -7823,17 +7787,17 @@ 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 7823 "RajcePublishing.c"
+#line 7787 "RajcePublishing.c"
 	} else {
-		GtkRadioButton* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		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 7833 "RajcePublishing.c"
+#line 7797 "RajcePublishing.c"
 	}
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp10_ = self->priv->publish_button;
@@ -7841,7 +7805,7 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp3_);
 #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (album_name);
-#line 7841 "RajcePublishing.c"
+#line 7805 "RajcePublishing.c"
 }
 
 
@@ -7850,47 +7814,47 @@ static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed
 	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 7850 "RajcePublishing.c"
+#line 7814 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self) {
-	PublishingRajceAlbum** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkRadioButton* _tmp15_ = NULL;
+	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 7860 "RajcePublishing.c"
+#line 7824 "RajcePublishing.c"
 	{
 		gint i = 0;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		i = 0;
-#line 7865 "RajcePublishing.c"
+#line 7829 "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 7872 "RajcePublishing.c"
-				gint _tmp2_ = 0;
-				PublishingRajceAlbum** _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				GtkComboBoxText* _tmp4_ = NULL;
-				PublishingRajceAlbum** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				PublishingRajceAlbum* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
+#line 7836 "RajcePublishing.c"
+				gint _tmp2_;
+				PublishingRajceAlbum** _tmp3_;
+				gint _tmp3__length1;
+				GtkComboBoxText* _tmp4_;
+				PublishingRajceAlbum** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				PublishingRajceAlbum* _tmp7_;
+				const gchar* _tmp8_;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				if (!_tmp0_) {
-#line 7884 "RajcePublishing.c"
-					gint _tmp1_ = 0;
+#line 7848 "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 7890 "RajcePublishing.c"
+#line 7854 "RajcePublishing.c"
 				}
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp0_ = FALSE;
@@ -7904,7 +7868,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 7904 "RajcePublishing.c"
+#line 7868 "RajcePublishing.c"
 				}
 #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp4_ = self->priv->existing_albums_combo;
@@ -7920,7 +7884,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 7920 "RajcePublishing.c"
+#line 7884 "RajcePublishing.c"
 			}
 		}
 	}
@@ -7930,9 +7894,9 @@ 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 7930 "RajcePublishing.c"
-		GtkComboBoxText* _tmp10_ = NULL;
-		GtkRadioButton* _tmp11_ = NULL;
+#line 7894 "RajcePublishing.c"
+		GtkComboBoxText* _tmp10_;
+		GtkRadioButton* _tmp11_;
 #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp10_ = self->priv->existing_albums_combo;
 #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7941,11 +7905,11 @@ 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 7941 "RajcePublishing.c"
+#line 7905 "RajcePublishing.c"
 	} else {
-		GtkComboBoxText* _tmp12_ = NULL;
-		GtkComboBoxText* _tmp13_ = NULL;
-		GtkRadioButton* _tmp14_ = NULL;
+		GtkComboBoxText* _tmp12_;
+		GtkComboBoxText* _tmp13_;
+		GtkRadioButton* _tmp14_;
 #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = self->priv->existing_albums_combo;
 #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7958,7 +7922,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 7958 "RajcePublishing.c"
+#line 7922 "RajcePublishing.c"
 	}
 #line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp15_ = self->priv->create_new_radio;
@@ -7966,12 +7930,12 @@ 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 7966 "RajcePublishing.c"
+#line 7930 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters) {
-	PublishingRajcePublishingParameters* _tmp0_ = NULL;
+	PublishingRajcePublishingParameters* _tmp0_;
 #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"
@@ -7979,8 +7943,8 @@ void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePub
 #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_by_name (self, "publish", _tmp0_);
-#line 7980 "RajcePublishing.c"
+	g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_);
+#line 7944 "RajcePublishing.c"
 }
 
 
@@ -7988,15 +7952,15 @@ void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePubl
 #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_by_name (self, "logout");
-#line 7989 "RajcePublishing.c"
+	g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 7953 "RajcePublishing.c"
 }
 
 
 GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self) {
 	GtkWidget* result = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkButton* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8007,15 +7971,15 @@ 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 8007 "RajcePublishing.c"
+#line 7971 "RajcePublishing.c"
 }
 
 
 static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingRajcePublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8026,7 +7990,7 @@ 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 8026 "RajcePublishing.c"
+#line 7990 "RajcePublishing.c"
 }
 
 
@@ -8039,21 +8003,21 @@ 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 8039 "RajcePublishing.c"
+#line 8003 "RajcePublishing.c"
 }
 
 
 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 8046 "RajcePublishing.c"
+#line 8010 "RajcePublishing.c"
 }
 
 
 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 8053 "RajcePublishing.c"
+#line 8017 "RajcePublishing.c"
 }
 
 
@@ -8067,14 +8031,14 @@ 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 8067 "RajcePublishing.c"
+#line 8031 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingRajcePublishingOptionsPane * self;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
 #line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
 #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8085,7 +8049,7 @@ 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 8085 "RajcePublishing.c"
+#line 8049 "RajcePublishing.c"
 }
 
 
@@ -8104,19 +8068,19 @@ 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 8104 "RajcePublishing.c"
+#line 8068 "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 8110 "RajcePublishing.c"
+#line 8074 "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 8116 "RajcePublishing.c"
+#line 8080 "RajcePublishing.c"
 }
 
 
@@ -8128,10 +8092,10 @@ static void publishing_rajce_publishing_options_pane_class_init (PublishingRajce
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rajce_publishing_options_pane_finalize;
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	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);
+	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"
-	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 8131 "RajcePublishing.c"
+	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"
 }
 
 
@@ -8139,14 +8103,14 @@ static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane
 #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"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_get_widget;
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_get_preferred_geometry;
 #line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_on_pane_installed;
+	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 8146 "RajcePublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_on_pane_uninstalled;
+#line 8110 "RajcePublishing.c"
 }
 
 
@@ -8177,11 +8141,11 @@ 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 8177 "RajcePublishing.c"
+#line 8141 "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);
@@ -8217,7 +8181,7 @@ 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 8217 "RajcePublishing.c"
+#line 8181 "RajcePublishing.c"
 }
 
 
@@ -8241,25 +8205,25 @@ static PublishingRajcePublishingParameters* publishing_rajce_publishing_paramete
 	self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8241 "RajcePublishing.c"
+#line 8205 "RajcePublishing.c"
 }
 
 
 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 8248 "RajcePublishing.c"
+#line 8212 "RajcePublishing.c"
 }
 
 
 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_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_;
+	gboolean* _tmp3_;
+	gint _tmp4_;
+	gint* _tmp5_;
 #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"
@@ -8290,23 +8254,23 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons
 	self->album_id = _tmp5_;
 #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8290 "RajcePublishing.c"
+#line 8254 "RajcePublishing.c"
 }
 
 
 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 8297 "RajcePublishing.c"
+#line 8261 "RajcePublishing.c"
 }
 
 
 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_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
+	gint* _tmp3_;
 #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"
@@ -8333,21 +8297,21 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons
 	self->album_id = _tmp3_;
 #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8333 "RajcePublishing.c"
+#line 8297 "RajcePublishing.c"
 }
 
 
 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 8340 "RajcePublishing.c"
+#line 8304 "RajcePublishing.c"
 }
 
 
 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 8347 "RajcePublishing.c"
+#line 8311 "RajcePublishing.c"
 }
 
 
@@ -8356,7 +8320,7 @@ static void publishing_rajce_value_publishing_parameters_free_value (GValue* val
 	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 8356 "RajcePublishing.c"
+#line 8320 "RajcePublishing.c"
 	}
 }
 
@@ -8366,11 +8330,11 @@ static void publishing_rajce_value_publishing_parameters_copy_value (const GValu
 	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 8366 "RajcePublishing.c"
+#line 8330 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8370 "RajcePublishing.c"
+#line 8334 "RajcePublishing.c"
 	}
 }
 
@@ -8378,66 +8342,66 @@ static void publishing_rajce_value_publishing_parameters_copy_value (const GValu
 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 8378 "RajcePublishing.c"
+#line 8342 "RajcePublishing.c"
 }
 
 
 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 8385 "RajcePublishing.c"
-		PublishingRajcePublishingParameters* object;
+#line 8349 "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 8392 "RajcePublishing.c"
+#line 8356 "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 8396 "RajcePublishing.c"
+#line 8360 "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 8400 "RajcePublishing.c"
+#line 8364 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8404 "RajcePublishing.c"
+#line 8368 "RajcePublishing.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 8408 "RajcePublishing.c"
+#line 8372 "RajcePublishing.c"
 }
 
 
 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;
+	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 8419 "RajcePublishing.c"
+#line 8383 "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 8425 "RajcePublishing.c"
+#line 8389 "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 8429 "RajcePublishing.c"
+#line 8393 "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 8433 "RajcePublishing.c"
+#line 8397 "RajcePublishing.c"
 	}
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 8437 "RajcePublishing.c"
+#line 8401 "RajcePublishing.c"
 }
 
 
@@ -8451,7 +8415,7 @@ 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 8451 "RajcePublishing.c"
+#line 8415 "RajcePublishing.c"
 }
 
 
@@ -8460,12 +8424,12 @@ gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value)
 	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 8460 "RajcePublishing.c"
+#line 8424 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingRajcePublishingParameters* old;
+	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));
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8480,23 +8444,23 @@ 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 8480 "RajcePublishing.c"
+#line 8444 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8484 "RajcePublishing.c"
+#line 8448 "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 8490 "RajcePublishing.c"
+#line 8454 "RajcePublishing.c"
 	}
 }
 
 
 void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingRajcePublishingParameters* old;
+	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));
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8509,17 +8473,17 @@ 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 8509 "RajcePublishing.c"
+#line 8473 "RajcePublishing.c"
 	} else {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8513 "RajcePublishing.c"
+#line 8477 "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 8519 "RajcePublishing.c"
+#line 8483 "RajcePublishing.c"
 	}
 }
 
@@ -8529,18 +8493,18 @@ static void publishing_rajce_publishing_parameters_class_init (PublishingRajcePu
 	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 8529 "RajcePublishing.c"
+#line 8493 "RajcePublishing.c"
 }
 
 
 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 8536 "RajcePublishing.c"
+#line 8500 "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);
@@ -8552,7 +8516,7 @@ 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 8552 "RajcePublishing.c"
+#line 8516 "RajcePublishing.c"
 }
 
 
@@ -8571,18 +8535,18 @@ GType publishing_rajce_publishing_parameters_get_type (void) {
 
 
 gpointer publishing_rajce_publishing_parameters_ref (gpointer instance) {
-	PublishingRajcePublishingParameters* self;
+	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 8577 "RajcePublishing.c"
+#line 8541 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_publishing_parameters_unref (gpointer instance) {
-	PublishingRajcePublishingParameters* self;
+	PublishingRajcePublishingParameters * self;
 	self = instance;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8590,7 +8554,7 @@ 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 8590 "RajcePublishing.c"
+#line 8554 "RajcePublishing.c"
 	}
 }
 
@@ -8601,14 +8565,14 @@ PublishingRajceSession* publishing_rajce_session_construct (GType object_type) {
 	self = (PublishingRajceSession*) publishing_rest_support_session_construct (object_type, "");
 #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8601 "RajcePublishing.c"
+#line 8565 "RajcePublishing.c"
 }
 
 
 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 8608 "RajcePublishing.c"
+#line 8572 "RajcePublishing.c"
 }
 
 
@@ -8617,58 +8581,58 @@ static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSu
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gint* _tmp2_ = NULL;
+	gint* _tmp2_;
 #line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession);
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = self->priv->userid;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 8624 "RajcePublishing.c"
-		const gchar* _tmp3_ = NULL;
+#line 8588 "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 8630 "RajcePublishing.c"
+#line 8594 "RajcePublishing.c"
 	} else {
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp1_ = FALSE;
-#line 8634 "RajcePublishing.c"
+#line 8598 "RajcePublishing.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1_) {
-#line 8638 "RajcePublishing.c"
-		const gchar* _tmp4_ = NULL;
+#line 8602 "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 8644 "RajcePublishing.c"
+#line 8608 "RajcePublishing.c"
 	} else {
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 8648 "RajcePublishing.c"
+#line 8612 "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 8654 "RajcePublishing.c"
+#line 8618 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_authenticate (PublishingRajceSession* self, const gchar* token, const gchar* name, gint id, gint maxsize, gint quality) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint* _tmp9_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp4_;
+	gint* _tmp5_;
+	gint _tmp6_;
+	gint* _tmp7_;
+	gint _tmp8_;
+	gint* _tmp9_;
 #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"
@@ -8715,7 +8679,7 @@ void publishing_rajce_session_authenticate (PublishingRajceSession* self, const
 	_g_free0 (self->priv->quality);
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->quality = _tmp9_;
-#line 8715 "RajcePublishing.c"
+#line 8679 "RajcePublishing.c"
 }
 
 
@@ -8750,13 +8714,13 @@ 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 8750 "RajcePublishing.c"
+#line 8714 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -8767,13 +8731,13 @@ void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const
 	_g_free0 (self->priv->usertoken);
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->usertoken = _tmp1_;
-#line 8767 "RajcePublishing.c"
+#line 8731 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -8784,13 +8748,13 @@ void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, cons
 	_g_free0 (self->priv->albumtoken);
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albumtoken = _tmp1_;
-#line 8784 "RajcePublishing.c"
+#line 8748 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -8801,14 +8765,14 @@ void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, con
 	_g_free0 (self->priv->albumticket);
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albumticket = _tmp1_;
-#line 8801 "RajcePublishing.c"
+#line 8765 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8819,14 +8783,14 @@ 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 8819 "RajcePublishing.c"
+#line 8783 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8837,14 +8801,14 @@ 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 8837 "RajcePublishing.c"
+#line 8801 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8855,14 +8819,14 @@ 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 8855 "RajcePublishing.c"
+#line 8819 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
 #line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8873,13 +8837,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 8873 "RajcePublishing.c"
+#line 8837 "RajcePublishing.c"
 }
 
 
 gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) {
 	gint result = 0;
-	gint* _tmp0_ = NULL;
+	gint* _tmp0_;
 #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), 0);
 #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8888,7 +8852,7 @@ 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 8888 "RajcePublishing.c"
+#line 8852 "RajcePublishing.c"
 }
 
 
@@ -8900,8 +8864,8 @@ static void publishing_rajce_session_class_init (PublishingRajceSessionClass * k
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	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 8901 "RajcePublishing.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rajce_session_real_is_authenticated;
+#line 8865 "RajcePublishing.c"
 }
 
 
@@ -8922,11 +8886,11 @@ 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 8922 "RajcePublishing.c"
+#line 8886 "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);
@@ -8946,7 +8910,7 @@ static void publishing_rajce_session_finalize (PublishingRESTSupportSession* obj
 	_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 8946 "RajcePublishing.c"
+#line 8910 "RajcePublishing.c"
 }
 
 
@@ -8968,17 +8932,17 @@ GType publishing_rajce_session_get_type (void) {
 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 8968 "RajcePublishing.c"
+#line 8932 "RajcePublishing.c"
 }
 
 
 PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* k, const gchar* v) {
 	PublishingRajceArgItem* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingRajceArgItem** _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRajceArgItem** _tmp4_;
 #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"
@@ -9009,39 +8973,39 @@ PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type,
 	self->_children_size_ = self->children_length1;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 9009 "RajcePublishing.c"
+#line 8973 "RajcePublishing.c"
 }
 
 
 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 9016 "RajcePublishing.c"
+#line 8980 "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 9027 "RajcePublishing.c"
+#line 8991 "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 9033 "RajcePublishing.c"
+#line 8997 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, PublishingRajceArgItem* child) {
-	PublishingRajceArgItem** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingRajceArgItem* _tmp1_ = NULL;
-	PublishingRajceArgItem* _tmp2_ = NULL;
+	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"
@@ -9056,20 +9020,20 @@ void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, Publishin
 	_tmp2_ = _publishing_rajce_arg_item_ref0 (_tmp1_);
 #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 9056 "RajcePublishing.c"
+#line 9020 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1) {
-	PublishingRajceArgItem** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingRajceArgItem** _tmp0_;
+	gint _tmp0__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 9069 "RajcePublishing.c"
+#line 9033 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** child_collection = NULL;
 		gint child_collection_length1 = 0;
@@ -9081,23 +9045,23 @@ void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, Publis
 		child_collection_length1 = _tmp0__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 9081 "RajcePublishing.c"
-			PublishingRajceArgItem* _tmp1_ = NULL;
+#line 9045 "RajcePublishing.c"
+			PublishingRajceArgItem* _tmp1_;
 			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]);
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			child = _tmp1_;
-#line 9088 "RajcePublishing.c"
+#line 9052 "RajcePublishing.c"
 			{
-				PublishingRajceArgItem* _tmp2_ = NULL;
+				PublishingRajceArgItem* _tmp2_;
 #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp2_ = child;
 #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				publishing_rajce_arg_item_AddChild (self, _tmp2_);
 #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
-#line 9097 "RajcePublishing.c"
+#line 9061 "RajcePublishing.c"
 			}
 		}
 	}
@@ -9107,7 +9071,7 @@ void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, Publis
 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 9107 "RajcePublishing.c"
+#line 9071 "RajcePublishing.c"
 }
 
 
@@ -9116,7 +9080,7 @@ static void publishing_rajce_value_arg_item_free_value (GValue* value) {
 	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 9116 "RajcePublishing.c"
+#line 9080 "RajcePublishing.c"
 	}
 }
 
@@ -9126,11 +9090,11 @@ static void publishing_rajce_value_arg_item_copy_value (const GValue* src_value,
 	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 9126 "RajcePublishing.c"
+#line 9090 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9130 "RajcePublishing.c"
+#line 9094 "RajcePublishing.c"
 	}
 }
 
@@ -9138,66 +9102,66 @@ static void publishing_rajce_value_arg_item_copy_value (const GValue* src_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 9138 "RajcePublishing.c"
+#line 9102 "RajcePublishing.c"
 }
 
 
 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 9145 "RajcePublishing.c"
-		PublishingRajceArgItem* object;
+#line 9109 "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 9152 "RajcePublishing.c"
+#line 9116 "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 9156 "RajcePublishing.c"
+#line 9120 "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 9160 "RajcePublishing.c"
+#line 9124 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9164 "RajcePublishing.c"
+#line 9128 "RajcePublishing.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9168 "RajcePublishing.c"
+#line 9132 "RajcePublishing.c"
 }
 
 
 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;
+	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 9179 "RajcePublishing.c"
+#line 9143 "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 9185 "RajcePublishing.c"
+#line 9149 "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 9189 "RajcePublishing.c"
+#line 9153 "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 9193 "RajcePublishing.c"
+#line 9157 "RajcePublishing.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9197 "RajcePublishing.c"
+#line 9161 "RajcePublishing.c"
 }
 
 
@@ -9211,7 +9175,7 @@ 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 9211 "RajcePublishing.c"
+#line 9175 "RajcePublishing.c"
 }
 
 
@@ -9220,12 +9184,12 @@ gpointer publishing_rajce_value_get_arg_item (const GValue* value) {
 	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 9220 "RajcePublishing.c"
+#line 9184 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) {
-	PublishingRajceArgItem* old;
+	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));
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9240,23 +9204,23 @@ 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 9240 "RajcePublishing.c"
+#line 9204 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9244 "RajcePublishing.c"
+#line 9208 "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 9250 "RajcePublishing.c"
+#line 9214 "RajcePublishing.c"
 	}
 }
 
 
 void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) {
-	PublishingRajceArgItem* old;
+	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));
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9269,17 +9233,17 @@ 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 9269 "RajcePublishing.c"
+#line 9233 "RajcePublishing.c"
 	} else {
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9273 "RajcePublishing.c"
+#line 9237 "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 9279 "RajcePublishing.c"
+#line 9243 "RajcePublishing.c"
 	}
 }
 
@@ -9289,21 +9253,21 @@ static void publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass *
 	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 9289 "RajcePublishing.c"
+#line 9253 "RajcePublishing.c"
 }
 
 
 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 9296 "RajcePublishing.c"
+#line 9260 "RajcePublishing.c"
 }
 
 
-static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) {
+static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
 	PublishingRajceArgItem * self;
-	PublishingRajceArgItem** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingRajceArgItem** _tmp0_;
+	gint _tmp0__length1;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ARG_ITEM, PublishingRajceArgItem);
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9312,7 +9276,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 9312 "RajcePublishing.c"
+#line 9276 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** child_collection = NULL;
 		gint child_collection_length1 = 0;
@@ -9324,14 +9288,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 9324 "RajcePublishing.c"
-			PublishingRajceArgItem* _tmp1_ = NULL;
+#line 9288 "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 9331 "RajcePublishing.c"
+#line 9295 "RajcePublishing.c"
 			{
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
@@ -9339,7 +9303,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 9339 "RajcePublishing.c"
+#line 9303 "RajcePublishing.c"
 			}
 		}
 	}
@@ -9349,7 +9313,7 @@ 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 9349 "RajcePublishing.c"
+#line 9313 "RajcePublishing.c"
 }
 
 
@@ -9368,18 +9332,18 @@ GType publishing_rajce_arg_item_get_type (void) {
 
 
 gpointer publishing_rajce_arg_item_ref (gpointer instance) {
-	PublishingRajceArgItem* self;
+	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 9374 "RajcePublishing.c"
+#line 9338 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_arg_item_unref (gpointer instance) {
-	PublishingRajceArgItem* self;
+	PublishingRajceArgItem * self;
 	self = instance;
 #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -9387,16 +9351,16 @@ 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 9387 "RajcePublishing.c"
+#line 9351 "RajcePublishing.c"
 	}
 }
 
 
 PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type, const gchar* cmd) {
 	PublishingRajceLiveApiRequest* self = NULL;
-	PublishingRajceArgItem** _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	PublishingRajceArgItem** _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #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"
@@ -9421,40 +9385,40 @@ PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GTyp
 	self->priv->_cmd = _tmp2_;
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 9421 "RajcePublishing.c"
+#line 9385 "RajcePublishing.c"
 }
 
 
 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 9428 "RajcePublishing.c"
+#line 9392 "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 9439 "RajcePublishing.c"
+#line 9403 "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 9445 "RajcePublishing.c"
+#line 9409 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self, const gchar* name, const gchar* val) {
-	PublishingRajceArgItem** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRajceArgItem* _tmp3_ = NULL;
+	PublishingRajceArgItem** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRajceArgItem* _tmp3_;
 #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"
@@ -9473,14 +9437,14 @@ void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest*
 	_tmp3_ = publishing_rajce_arg_item_new (_tmp1_, _tmp2_);
 #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 9473 "RajcePublishing.c"
+#line 9437 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self, const gchar* name, gboolean val) {
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = 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"
@@ -9491,25 +9455,25 @@ void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiReque
 	if (_tmp1_) {
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = "1";
-#line 9491 "RajcePublishing.c"
+#line 9455 "RajcePublishing.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = "0";
-#line 9495 "RajcePublishing.c"
+#line 9459 "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 9501 "RajcePublishing.c"
+#line 9465 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self, const gchar* name, gint val) {
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #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"
@@ -9526,36 +9490,36 @@ void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiReques
 	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 9526 "RajcePublishing.c"
+#line 9490 "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 9537 "RajcePublishing.c"
+#line 9501 "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 9543 "RajcePublishing.c"
+#line 9507 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self, const gchar* name, PublishingRajceArgItem** val, int val_length1) {
 	PublishingRajceArgItem* newItem = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingRajceArgItem* _tmp1_ = NULL;
-	PublishingRajceArgItem** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PublishingRajceArgItem** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PublishingRajceArgItem* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	PublishingRajceArgItem* _tmp1_;
+	PublishingRajceArgItem** _tmp2_;
+	gint _tmp2__length1;
+	PublishingRajceArgItem** _tmp3_;
+	gint _tmp3__length1;
+	PublishingRajceArgItem* _tmp4_;
 #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"
@@ -9582,30 +9546,30 @@ void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiReque
 	_vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp4_);
 #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_arg_item_unref0 (newItem);
-#line 9582 "RajcePublishing.c"
+#line 9546 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self, gboolean urlencode) {
 	gchar* result = NULL;
 	xmlDoc* doc = NULL;
-	xmlDoc* _tmp0_ = NULL;
+	xmlDoc* _tmp0_;
 	xmlNode* root = NULL;
-	xmlNode* _tmp1_ = NULL;
-	xmlDoc* _tmp2_ = NULL;
-	xmlNode* _tmp3_ = NULL;
-	xmlNode* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	xmlNode* _tmp1_;
+	xmlDoc* _tmp2_;
+	xmlNode* _tmp3_;
+	xmlNode* _tmp4_;
+	const gchar* _tmp5_;
 	xmlNode* par = NULL;
-	xmlNode* _tmp6_ = NULL;
-	xmlNode* _tmp7_ = NULL;
-	PublishingRajceArgItem** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	xmlNode* _tmp6_;
+	xmlNode* _tmp7_;
+	PublishingRajceArgItem** _tmp8_;
+	gint _tmp8__length1;
 	gchar* xmlstr = NULL;
-	xmlDoc* _tmp12_ = NULL;
+	xmlDoc* _tmp12_;
 	gchar* _tmp13_ = NULL;
-	xmlDoc* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	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"
@@ -9638,7 +9602,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 9638 "RajcePublishing.c"
+#line 9602 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -9650,17 +9614,17 @@ 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 9650 "RajcePublishing.c"
-			PublishingRajceArgItem* _tmp9_ = NULL;
+#line 9614 "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 9657 "RajcePublishing.c"
+#line 9621 "RajcePublishing.c"
 			{
-				xmlNode* _tmp10_ = NULL;
-				PublishingRajceArgItem* _tmp11_ = NULL;
+				xmlNode* _tmp10_;
+				PublishingRajceArgItem* _tmp11_;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp10_ = par;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9669,7 +9633,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 9669 "RajcePublishing.c"
+#line 9633 "RajcePublishing.c"
 			}
 		}
 	}
@@ -9689,9 +9653,9 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 	_tmp15_ = urlencode;
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp15_) {
-#line 9689 "RajcePublishing.c"
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+#line 9653 "RajcePublishing.c"
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp16_ = xmlstr;
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9702,20 +9666,20 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 		_g_free0 (xmlstr);
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 9702 "RajcePublishing.c"
+#line 9666 "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 9708 "RajcePublishing.c"
+#line 9672 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, PublishingRajceArgItem* arg) {
-	PublishingRajceArgItem* _tmp0_ = NULL;
-	PublishingRajceArgItem** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	PublishingRajceArgItem* _tmp0_;
+	PublishingRajceArgItem** _tmp1_;
+	gint _tmp1__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"
@@ -9726,12 +9690,12 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 	_tmp1__length1 = _tmp0_->children_length1;
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1__length1 == 0) {
-#line 9726 "RajcePublishing.c"
-		xmlNode* _tmp2_ = NULL;
-		PublishingRajceArgItem* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		PublishingRajceArgItem* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+#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"
@@ -9744,16 +9708,16 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 		_tmp6_ = _tmp5_->val;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		xmlNewTextChild (_tmp2_, NULL, (xmlChar*) _tmp4_, (xmlChar*) _tmp6_);
-#line 9744 "RajcePublishing.c"
+#line 9708 "RajcePublishing.c"
 	} else {
 		xmlNode* subnode = NULL;
-		xmlNode* _tmp7_ = NULL;
-		PublishingRajceArgItem* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		xmlNode* _tmp10_ = NULL;
-		PublishingRajceArgItem* _tmp11_ = NULL;
-		PublishingRajceArgItem** _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
+		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"
@@ -9770,7 +9734,7 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 		_tmp12_ = _tmp11_->children;
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12__length1 = _tmp11_->children_length1;
-#line 9770 "RajcePublishing.c"
+#line 9734 "RajcePublishing.c"
 		{
 			PublishingRajceArgItem** child_collection = NULL;
 			gint child_collection_length1 = 0;
@@ -9782,17 +9746,17 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 			child_collection_length1 = _tmp12__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 9782 "RajcePublishing.c"
-				PublishingRajceArgItem* _tmp13_ = NULL;
+#line 9746 "RajcePublishing.c"
+				PublishingRajceArgItem* _tmp13_;
 				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]);
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				child = _tmp13_;
-#line 9789 "RajcePublishing.c"
+#line 9753 "RajcePublishing.c"
 				{
-					xmlNode* _tmp14_ = NULL;
-					PublishingRajceArgItem* _tmp15_ = NULL;
+					xmlNode* _tmp14_;
+					PublishingRajceArgItem* _tmp15_;
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp14_ = subnode;
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9801,7 +9765,7 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 					publishing_rajce_live_api_request_WriteParam (_tmp14_, _tmp15_);
 #line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_publishing_rajce_arg_item_unref0 (child);
-#line 9801 "RajcePublishing.c"
+#line 9765 "RajcePublishing.c"
 				}
 			}
 		}
@@ -9812,7 +9776,7 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 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 9812 "RajcePublishing.c"
+#line 9776 "RajcePublishing.c"
 }
 
 
@@ -9821,7 +9785,7 @@ static void publishing_rajce_value_live_api_request_free_value (GValue* value) {
 	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 9821 "RajcePublishing.c"
+#line 9785 "RajcePublishing.c"
 	}
 }
 
@@ -9831,11 +9795,11 @@ static void publishing_rajce_value_live_api_request_copy_value (const GValue* sr
 	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 9831 "RajcePublishing.c"
+#line 9795 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9835 "RajcePublishing.c"
+#line 9799 "RajcePublishing.c"
 	}
 }
 
@@ -9843,66 +9807,66 @@ static void publishing_rajce_value_live_api_request_copy_value (const GValue* sr
 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 9843 "RajcePublishing.c"
+#line 9807 "RajcePublishing.c"
 }
 
 
 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 9850 "RajcePublishing.c"
-		PublishingRajceLiveApiRequest* object;
+#line 9814 "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 9857 "RajcePublishing.c"
+#line 9821 "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 9861 "RajcePublishing.c"
+#line 9825 "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 9865 "RajcePublishing.c"
+#line 9829 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9869 "RajcePublishing.c"
+#line 9833 "RajcePublishing.c"
 	}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9873 "RajcePublishing.c"
+#line 9837 "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) {
-	PublishingRajceLiveApiRequest** object_p;
+	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 9884 "RajcePublishing.c"
+#line 9848 "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 9890 "RajcePublishing.c"
+#line 9854 "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 9894 "RajcePublishing.c"
+#line 9858 "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 9898 "RajcePublishing.c"
+#line 9862 "RajcePublishing.c"
 	}
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9902 "RajcePublishing.c"
+#line 9866 "RajcePublishing.c"
 }
 
 
@@ -9916,7 +9880,7 @@ 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 9916 "RajcePublishing.c"
+#line 9880 "RajcePublishing.c"
 }
 
 
@@ -9925,12 +9889,12 @@ gpointer publishing_rajce_value_get_live_api_request (const GValue* value) {
 	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 9925 "RajcePublishing.c"
+#line 9889 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object) {
-	PublishingRajceLiveApiRequest* old;
+	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));
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9945,23 +9909,23 @@ 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 9945 "RajcePublishing.c"
+#line 9909 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9949 "RajcePublishing.c"
+#line 9913 "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 9955 "RajcePublishing.c"
+#line 9919 "RajcePublishing.c"
 	}
 }
 
 
 void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object) {
-	PublishingRajceLiveApiRequest* old;
+	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));
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9974,17 +9938,17 @@ 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 9974 "RajcePublishing.c"
+#line 9938 "RajcePublishing.c"
 	} else {
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9978 "RajcePublishing.c"
+#line 9942 "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 9984 "RajcePublishing.c"
+#line 9948 "RajcePublishing.c"
 	}
 }
 
@@ -9996,7 +9960,7 @@ static void publishing_rajce_live_api_request_class_init (PublishingRajceLiveApi
 	((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 9996 "RajcePublishing.c"
+#line 9960 "RajcePublishing.c"
 }
 
 
@@ -10005,11 +9969,11 @@ static void publishing_rajce_live_api_request_instance_init (PublishingRajceLive
 	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 10005 "RajcePublishing.c"
+#line 9969 "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);
@@ -10019,7 +9983,7 @@ 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 10019 "RajcePublishing.c"
+#line 9983 "RajcePublishing.c"
 }
 
 
@@ -10038,18 +10002,18 @@ GType publishing_rajce_live_api_request_get_type (void) {
 
 
 gpointer publishing_rajce_live_api_request_ref (gpointer instance) {
-	PublishingRajceLiveApiRequest* self;
+	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 10044 "RajcePublishing.c"
+#line 10008 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_live_api_request_unref (gpointer instance) {
-	PublishingRajceLiveApiRequest* self;
+	PublishingRajceLiveApiRequest * self;
 	self = instance;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -10057,14 +10021,14 @@ 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 10057 "RajcePublishing.c"
+#line 10021 "RajcePublishing.c"
 	}
 }
 
 
 PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session) {
 	PublishingRajceTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_ = 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"
@@ -10073,40 +10037,40 @@ PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object
 	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);
 #line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10073 "RajcePublishing.c"
+#line 10037 "RajcePublishing.c"
 }
 
 
 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 10080 "RajcePublishing.c"
+#line 10044 "RajcePublishing.c"
 }
 
 
 gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
-	xmlNode* _tmp2_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp0_;
+	xmlNode* _tmp1_;
+	xmlNode* _tmp2_;
 	gchar* name = NULL;
-	xmlNode* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	xmlNode* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 	gboolean _tmp7_ = FALSE;
-	const gchar* _tmp8_ = NULL;
+	const gchar* _tmp8_;
 	xmlNode* errcode = NULL;
 	xmlNode* _result_ = NULL;
-	xmlNode* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	xmlNode* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
+	xmlNode* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gint _tmp22_;
+	xmlNode* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
 	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);
@@ -10120,15 +10084,15 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 	_tmp2_ = root;
 #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp2_ == NULL) {
-#line 10120 "RajcePublishing.c"
-		gchar* _tmp3_ = NULL;
+#line 10084 "RajcePublishing.c"
+		gchar* _tmp3_;
 #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = g_strdup ("No XML returned from server");
 #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result = _tmp3_;
 #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10128 "RajcePublishing.c"
+#line 10092 "RajcePublishing.c"
 	}
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = root;
@@ -10144,19 +10108,19 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 	if (_tmp8_ == NULL) {
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = TRUE;
-#line 10144 "RajcePublishing.c"
+#line 10108 "RajcePublishing.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp9_;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp9_ = name;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = g_strcmp0 (_tmp9_, "response") != 0;
-#line 10151 "RajcePublishing.c"
+#line 10115 "RajcePublishing.c"
 	}
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp7_) {
-#line 10155 "RajcePublishing.c"
-		gchar* _tmp10_ = NULL;
+#line 10119 "RajcePublishing.c"
+		gchar* _tmp10_;
 #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp10_ = g_strdup ("No response from Rajce in XML");
 #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10165,17 +10129,17 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 		_g_free0 (name);
 #line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10165 "RajcePublishing.c"
+#line 10129 "RajcePublishing.c"
 	}
 	{
 		xmlNode* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
-		xmlNode* _tmp14_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
+		xmlNode* _tmp14_;
 		xmlNode* _tmp15_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp16_ = NULL;
-		xmlNode* _tmp17_ = NULL;
-		xmlNode* _tmp18_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp16_;
+		xmlNode* _tmp17_;
+		xmlNode* _tmp18_;
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = doc;
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10188,7 +10152,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 		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 10188 "RajcePublishing.c"
+#line 10152 "RajcePublishing.c"
 				goto __catch31_spit_publishing_publishing_error;
 			}
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10199,7 +10163,7 @@ 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 10199 "RajcePublishing.c"
+#line 10163 "RajcePublishing.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		errcode = _tmp11_;
@@ -10215,7 +10179,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 		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 10215 "RajcePublishing.c"
+#line 10179 "RajcePublishing.c"
 				goto __catch31_spit_publishing_publishing_error;
 			}
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10226,11 +10190,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 10226 "RajcePublishing.c"
+#line 10190 "RajcePublishing.c"
 		}
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_result_ = _tmp15_;
-#line 10230 "RajcePublishing.c"
+#line 10194 "RajcePublishing.c"
 	}
 	goto __finally31;
 	__catch31_spit_publishing_publishing_error:
@@ -10248,7 +10212,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 10248 "RajcePublishing.c"
+#line 10212 "RajcePublishing.c"
 	}
 	__finally31:
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10261,7 +10225,7 @@ 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 10261 "RajcePublishing.c"
+#line 10225 "RajcePublishing.c"
 	}
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp19_ = errcode;
@@ -10291,14 +10255,14 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 	_g_free0 (name);
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 10291 "RajcePublishing.c"
+#line 10255 "RajcePublishing.c"
 }
 
 
 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 10298 "RajcePublishing.c"
+#line 10262 "RajcePublishing.c"
 }
 
 
@@ -10326,15 +10290,15 @@ 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* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingRajceSession* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	PublishingRajceSession* _tmp1_;
+	const gchar* _tmp2_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRajceLiveApiRequest* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
 	gchar* xml = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp6_;
 #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"
@@ -10381,21 +10345,21 @@ 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 10381 "RajcePublishing.c"
+#line 10345 "RajcePublishing.c"
 }
 
 
 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 10388 "RajcePublishing.c"
+#line 10352 "RajcePublishing.c"
 }
 
 
 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 10395 "RajcePublishing.c"
+#line 10359 "RajcePublishing.c"
 }
 
 
@@ -10418,123 +10382,123 @@ 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 10425 "RajcePublishing.c"
+#line 10389 "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 10431 "RajcePublishing.c"
+#line 10395 "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 10442 "RajcePublishing.c"
+#line 10406 "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 10448 "RajcePublishing.c"
+#line 10412 "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 10459 "RajcePublishing.c"
+#line 10423 "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 10465 "RajcePublishing.c"
+#line 10429 "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 10476 "RajcePublishing.c"
+#line 10440 "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 10482 "RajcePublishing.c"
+#line 10446 "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 10493 "RajcePublishing.c"
+#line 10457 "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 10499 "RajcePublishing.c"
+#line 10463 "RajcePublishing.c"
 }
 
 
 PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
 	PublishingRajceGetAlbumsTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_ = NULL;
-	PublishingRajceSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingRajceLiveApiRequest* _tmp2_;
+	PublishingRajceSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	PublishingRajceArgItem** columns = NULL;
-	PublishingRajceArgItem** _tmp6_ = NULL;
-	gint columns_length1 = 0;
-	gint _columns_size_ = 0;
-	PublishingRajceArgItem** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	PublishingRajceArgItem* _tmp8_ = NULL;
-	PublishingRajceArgItem** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	PublishingRajceArgItem* _tmp10_ = NULL;
-	PublishingRajceArgItem** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	PublishingRajceArgItem* _tmp12_ = NULL;
-	PublishingRajceArgItem** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	PublishingRajceArgItem* _tmp14_ = NULL;
-	PublishingRajceArgItem** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	PublishingRajceArgItem* _tmp16_ = NULL;
-	PublishingRajceArgItem** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
+	PublishingRajceArgItem** _tmp6_;
+	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;
 	gchar* xml = NULL;
-	gchar* _tmp18_ = NULL;
+	gchar* _tmp18_;
 #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"
@@ -10627,21 +10591,21 @@ 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 10627 "RajcePublishing.c"
+#line 10591 "RajcePublishing.c"
 }
 
 
 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 10634 "RajcePublishing.c"
+#line 10598 "RajcePublishing.c"
 }
 
 
 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 10641 "RajcePublishing.c"
+#line 10605 "RajcePublishing.c"
 }
 
 
@@ -10666,17 +10630,17 @@ 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* self = NULL;
-	PublishingRajceSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_ = NULL;
-	PublishingRajceSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	PublishingRajceLiveApiRequest* _tmp2_;
+	PublishingRajceSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
 	gchar* xml = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp8_;
 #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"
@@ -10725,21 +10689,21 @@ 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 10725 "RajcePublishing.c"
+#line 10689 "RajcePublishing.c"
 }
 
 
 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 10732 "RajcePublishing.c"
+#line 10696 "RajcePublishing.c"
 }
 
 
 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 10739 "RajcePublishing.c"
+#line 10703 "RajcePublishing.c"
 }
 
 
@@ -10764,16 +10728,16 @@ 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* self = NULL;
-	PublishingRajceSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_ = NULL;
-	PublishingRajceSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	PublishingRajceLiveApiRequest* _tmp2_;
+	PublishingRajceSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gint _tmp6_;
 	gchar* xml = NULL;
-	gchar* _tmp7_ = NULL;
+	gchar* _tmp7_;
 #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"
@@ -10814,21 +10778,21 @@ 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 10814 "RajcePublishing.c"
+#line 10778 "RajcePublishing.c"
 }
 
 
 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 10821 "RajcePublishing.c"
+#line 10785 "RajcePublishing.c"
 }
 
 
 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 10828 "RajcePublishing.c"
+#line 10792 "RajcePublishing.c"
 }
 
 
@@ -10853,18 +10817,18 @@ 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* self = NULL;
-	PublishingRajceSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_ = NULL;
-	PublishingRajceSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingRajceSession* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	PublishingRajceLiveApiRequest* _tmp2_;
+	PublishingRajceSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingRajceSession* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	gchar* xml = NULL;
-	gchar* _tmp9_ = NULL;
+	gchar* _tmp9_;
 #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"
@@ -10911,21 +10875,21 @@ 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 10911 "RajcePublishing.c"
+#line 10875 "RajcePublishing.c"
 }
 
 
 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 10918 "RajcePublishing.c"
+#line 10882 "RajcePublishing.c"
 }
 
 
 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 10925 "RajcePublishing.c"
+#line 10889 "RajcePublishing.c"
 }
 
 
@@ -10950,18 +10914,18 @@ 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* self = NULL;
-	PublishingRajceSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_ = NULL;
-	PublishingRajceSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingRajceSession* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	PublishingRajceLiveApiRequest* _tmp2_;
+	PublishingRajceSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingRajceSession* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	gchar* xml = NULL;
-	gchar* _tmp9_ = NULL;
+	gchar* _tmp9_;
 #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"
@@ -11008,21 +10972,21 @@ 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 11008 "RajcePublishing.c"
+#line 10972 "RajcePublishing.c"
 }
 
 
 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 11015 "RajcePublishing.c"
+#line 10979 "RajcePublishing.c"
 }
 
 
 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 11022 "RajcePublishing.c"
+#line 10986 "RajcePublishing.c"
 }
 
 
@@ -11047,15 +11011,15 @@ 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* self = NULL;
-	PublishingRajceSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp2_ = NULL;
-	PublishingRajceSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingRajceLiveApiRequest* _tmp2_;
+	PublishingRajceSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	gchar* xml = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp6_;
 #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"
@@ -11092,21 +11056,21 @@ 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 11092 "RajcePublishing.c"
+#line 11056 "RajcePublishing.c"
 }
 
 
 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 11099 "RajcePublishing.c"
+#line 11063 "RajcePublishing.c"
 }
 
 
 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 11106 "RajcePublishing.c"
+#line 11070 "RajcePublishing.c"
 }
 
 
@@ -11132,75 +11096,75 @@ GType publishing_rajce_get_categories_transaction_get_type (void) {
 static void _g_free0_ (gpointer var) {
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	var = (g_free (var), NULL);
-#line 11132 "RajcePublishing.c"
+#line 11096 "RajcePublishing.c"
 }
 
 
 PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingRajceAddPhotoTransaction* self = NULL;
-	PublishingRajceSession* _tmp0_ = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRajcePublishingParameters* _tmp3_ = NULL;
-	PublishingRajcePublishingParameters* _tmp4_ = NULL;
+	PublishingRajceSession* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRajcePublishingParameters* _tmp3_;
+	PublishingRajcePublishingParameters* _tmp4_;
 	const gchar* _tmp5_ = NULL;
-	PublishingRajcePublishingParameters* _tmp6_ = NULL;
-	gint* _tmp7_ = NULL;
-	SpitPublishingPublishable* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	PublishingRajcePublishingParameters* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
+	PublishingRajcePublishingParameters* _tmp6_;
+	gint* _tmp7_;
+	SpitPublishingPublishable* _tmp8_;
+	GFile* _tmp9_;
+	GFile* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	PublishingRajcePublishingParameters* _tmp13_;
+	const gchar* _tmp14_;
 	gchar* basename = NULL;
-	SpitPublishingPublishable* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	SpitPublishingPublishable* _tmp15_;
+	gchar* _tmp16_;
 	gchar* comment = NULL;
-	SpitPublishingPublishable* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
+	SpitPublishingPublishable* _tmp17_;
+	gchar* _tmp18_;
 	gchar* pubname = NULL;
-	SpitPublishingPublishable* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
+	SpitPublishingPublishable* _tmp19_;
+	gchar* _tmp20_;
 	gint width = 0;
-	PublishingRajceSession* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
+	PublishingRajceSession* _tmp21_;
+	gint _tmp22_;
 	gint height = 0;
-	PublishingRajceSession* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
+	PublishingRajceSession* _tmp23_;
+	gint _tmp24_;
 	PublishingRajceLiveApiRequest* req = NULL;
-	PublishingRajceLiveApiRequest* _tmp25_ = NULL;
-	PublishingRajceLiveApiRequest* _tmp26_ = NULL;
-	PublishingRajceSession* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	PublishingRajceLiveApiRequest* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	PublishingRajceLiveApiRequest* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	PublishingRajceLiveApiRequest* _tmp34_ = NULL;
-	PublishingRajceSession* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	PublishingRajceLiveApiRequest* _tmp38_ = NULL;
-	const gchar* _tmp39_ = NULL;
-	PublishingRajceLiveApiRequest* _tmp40_ = NULL;
-	const gchar* _tmp41_ = NULL;
+	PublishingRajceLiveApiRequest* _tmp25_;
+	PublishingRajceLiveApiRequest* _tmp26_;
+	PublishingRajceSession* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	PublishingRajceLiveApiRequest* _tmp30_;
+	gint _tmp31_;
+	PublishingRajceLiveApiRequest* _tmp32_;
+	gint _tmp33_;
+	PublishingRajceLiveApiRequest* _tmp34_;
+	PublishingRajceSession* _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
+	PublishingRajceLiveApiRequest* _tmp38_;
+	const gchar* _tmp39_;
+	PublishingRajceLiveApiRequest* _tmp40_;
+	const gchar* _tmp41_;
 	const gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
-	PublishingRajceLiveApiRequest* _tmp45_ = NULL;
+	const gchar* _tmp43_;
+	PublishingRajceLiveApiRequest* _tmp45_;
 	gchar* xml = NULL;
-	PublishingRajceLiveApiRequest* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
+	PublishingRajceLiveApiRequest* _tmp46_;
+	gchar* _tmp47_;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp48_ = NULL;
-	GEqualFunc _tmp49_ = NULL;
-	GHashTable* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	const gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
+	GHashFunc _tmp48_;
+	GEqualFunc _tmp49_;
+	GHashTable* _tmp50_;
+	gchar* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
+	const gchar* _tmp54_;
+	gchar* _tmp55_;
 #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"
@@ -11233,11 +11197,11 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const
 	if ((*_tmp7_) > 0) {
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp5_ = "";
-#line 11233 "RajcePublishing.c"
+#line 11197 "RajcePublishing.c"
 	} else {
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp5_ = " new";
-#line 11237 "RajcePublishing.c"
+#line 11201 "RajcePublishing.c"
 	}
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = publishable;
@@ -11346,17 +11310,17 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const
 	_tmp43_ = comment;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp43_ != NULL) {
-#line 11345 "RajcePublishing.c"
-		const gchar* _tmp44_ = NULL;
+#line 11309 "RajcePublishing.c"
+		const gchar* _tmp44_;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp44_ = comment;
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp42_ = _tmp44_;
-#line 11351 "RajcePublishing.c"
+#line 11315 "RajcePublishing.c"
 	} else {
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp42_ = "";
-#line 11355 "RajcePublishing.c"
+#line 11319 "RajcePublishing.c"
 	}
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp45_ = req;
@@ -11408,14 +11372,14 @@ 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 11407 "RajcePublishing.c"
+#line 11371 "RajcePublishing.c"
 }
 
 
 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 11414 "RajcePublishing.c"
+#line 11378 "RajcePublishing.c"
 }
 
 
@@ -11426,7 +11390,7 @@ static void publishing_rajce_add_photo_transaction_class_init (PublishingRajceAd
 	((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 11425 "RajcePublishing.c"
+#line 11389 "RajcePublishing.c"
 }
 
 
@@ -11435,11 +11399,11 @@ static void publishing_rajce_add_photo_transaction_instance_init (PublishingRajc
 	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 11434 "RajcePublishing.c"
+#line 11398 "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);
@@ -11447,7 +11411,7 @@ 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 11446 "RajcePublishing.c"
+#line 11410 "RajcePublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index a04cec6..8749112 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c
@@ -1,4 +1,4 @@
-/* TumblrPublishing.c generated by valac 0.34.7, the Vala compiler
+/* TumblrPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from TumblrPublishing.vala, do not modify */
 
 /* Copyright 2012 BJA Electronics
@@ -155,9 +155,20 @@ typedef struct _PublishingTumblrTumblrPublisherUploader PublishingTumblrTumblrPu
 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;
@@ -381,8 +392,8 @@ 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 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;
@@ -391,16 +402,16 @@ static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSA
 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 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 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;
+static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
 
 GType tumblr_service_get_type (void) G_GNUC_CONST;
 enum  {
@@ -420,7 +431,7 @@ PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPub
 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);
+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"
@@ -439,7 +450,7 @@ enum  {
 };
 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);
+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);
@@ -452,7 +463,7 @@ enum  {
 };
 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);
+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))
@@ -462,9 +473,9 @@ enum  {
 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 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);
@@ -512,7 +523,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 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);
+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);
@@ -554,7 +565,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe
 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);
+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
@@ -579,7 +590,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
 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);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj);
 enum  {
 	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_DUMMY_PROPERTY
 };
@@ -606,26 +617,26 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 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);
+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);
+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);
+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_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);
@@ -633,8 +644,8 @@ static gint _vala_array_length (gpointer array);
 
 TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory) {
 	TumblrService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	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"
@@ -645,9 +656,9 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = tumblr_service_icon_pixbuf_set_length1;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 649 "TumblrPublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = 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"
@@ -658,27 +669,27 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire
 		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 662 "TumblrPublishing.c"
+#line 673 "TumblrPublishing.c"
 	}
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 666 "TumblrPublishing.c"
+#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 673 "TumblrPublishing.c"
+#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_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 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"
@@ -691,7 +702,7 @@ static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 695 "TumblrPublishing.c"
+#line 706 "TumblrPublishing.c"
 }
 
 
@@ -704,7 +715,7 @@ static const gchar* tumblr_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.tumblr";
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 708 "TumblrPublishing.c"
+#line 719 "TumblrPublishing.c"
 }
 
 
@@ -717,14 +728,14 @@ static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Tumblr";
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 721 "TumblrPublishing.c"
+#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 728 "TumblrPublishing.c"
+#line 739 "TumblrPublishing.c"
 }
 
 
@@ -735,34 +746,33 @@ static GdkPixbuf** _vala_array_dup6 (GdkPixbuf** self, int length) {
 	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 739 "TumblrPublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#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 745 "TumblrPublishing.c"
+#line 756 "TumblrPublishing.c"
 	}
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 749 "TumblrPublishing.c"
+#line 760 "TumblrPublishing.c"
 }
 
 
 static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	TumblrService * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GdkPixbuf** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GdkPixbuf** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	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"
@@ -774,60 +784,58 @@ static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #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_ = _ ("Copyright 2012 BJA Electronics");
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_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 = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_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 = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_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 = _tmp4_;
+	(*info).version = _tmp3_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_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 = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_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 = _tmp6_;
+	(*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"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_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 = _tmp7_;
+	(*info).license = _tmp6_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = tumblr_service_icon_pixbuf_set;
+	_tmp7_ = tumblr_service_icon_pixbuf_set;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8__length1 = tumblr_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = tumblr_service_icon_pixbuf_set_length1;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup6 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup6 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_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 = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 831 "TumblrPublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 839 "TumblrPublishing.c"
 }
 
 
@@ -835,15 +843,15 @@ static void tumblr_service_real_activation (SpitPluggable* base, gboolean enable
 	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 839 "TumblrPublishing.c"
+#line 847 "TumblrPublishing.c"
 }
 
 
 static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	TumblrService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingTumblrTumblrPublisher* _tmp1_ = 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"
@@ -856,7 +864,7 @@ static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublis
 	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 860 "TumblrPublishing.c"
+#line 868 "TumblrPublishing.c"
 }
 
 
@@ -869,7 +877,7 @@ static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media
 	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 873 "TumblrPublishing.c"
+#line 881 "TumblrPublishing.c"
 }
 
 
@@ -878,7 +886,7 @@ static void tumblr_service_class_init (TumblrServiceClass * klass) {
 	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 882 "TumblrPublishing.c"
+#line 890 "TumblrPublishing.c"
 }
 
 
@@ -886,16 +894,16 @@ static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * i
 #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;
+	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;
+	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;
+	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;
+	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 899 "TumblrPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation;
+#line 907 "TumblrPublishing.c"
 }
 
 
@@ -903,10 +911,10 @@ static void tumblr_service_spit_publishing_service_interface_init (SpitPublishin
 #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;
+	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 910 "TumblrPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media;
+#line 918 "TumblrPublishing.c"
 }
 
 
@@ -914,13 +922,13 @@ static void tumblr_service_instance_init (TumblrService * self) {
 }
 
 
-static void tumblr_service_finalize (GObject* obj) {
+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 924 "TumblrPublishing.c"
+#line 932 "TumblrPublishing.c"
 }
 
 
@@ -942,10 +950,10 @@ GType tumblr_service_get_type (void) {
 
 PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url) {
 	PublishingTumblrBlogEntry* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 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"
@@ -970,21 +978,21 @@ PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_
 	self->url = _tmp3_;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 974 "TumblrPublishing.c"
+#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 981 "TumblrPublishing.c"
+#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 988 "TumblrPublishing.c"
+#line 996 "TumblrPublishing.c"
 }
 
 
@@ -993,7 +1001,7 @@ static void publishing_tumblr_value_blog_entry_free_value (GValue* value) {
 	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 997 "TumblrPublishing.c"
+#line 1005 "TumblrPublishing.c"
 	}
 }
 
@@ -1003,11 +1011,11 @@ static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_val
 	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 1007 "TumblrPublishing.c"
+#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 1011 "TumblrPublishing.c"
+#line 1019 "TumblrPublishing.c"
 	}
 }
 
@@ -1015,66 +1023,66 @@ static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_val
 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 1019 "TumblrPublishing.c"
+#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 1026 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry* object;
+#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 1033 "TumblrPublishing.c"
+#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 1037 "TumblrPublishing.c"
+#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 1041 "TumblrPublishing.c"
+#line 1049 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1045 "TumblrPublishing.c"
+#line 1053 "TumblrPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1049 "TumblrPublishing.c"
+#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;
+	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 1060 "TumblrPublishing.c"
+#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 1066 "TumblrPublishing.c"
+#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 1070 "TumblrPublishing.c"
+#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 1074 "TumblrPublishing.c"
+#line 1082 "TumblrPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1078 "TumblrPublishing.c"
+#line 1086 "TumblrPublishing.c"
 }
 
 
@@ -1088,7 +1096,7 @@ GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gc
 	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 1092 "TumblrPublishing.c"
+#line 1100 "TumblrPublishing.c"
 }
 
 
@@ -1097,12 +1105,12 @@ gpointer publishing_tumblr_value_get_blog_entry (const GValue* value) {
 	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 1101 "TumblrPublishing.c"
+#line 1109 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry* old;
+	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"
@@ -1117,23 +1125,23 @@ void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
 		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 1121 "TumblrPublishing.c"
+#line 1129 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1125 "TumblrPublishing.c"
+#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 1131 "TumblrPublishing.c"
+#line 1139 "TumblrPublishing.c"
 	}
 }
 
 
 void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry* old;
+	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"
@@ -1146,17 +1154,17 @@ void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1150 "TumblrPublishing.c"
+#line 1158 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1154 "TumblrPublishing.c"
+#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 1160 "TumblrPublishing.c"
+#line 1168 "TumblrPublishing.c"
 	}
 }
 
@@ -1166,18 +1174,18 @@ static void publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryCl
 	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 1170 "TumblrPublishing.c"
+#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 1177 "TumblrPublishing.c"
+#line 1185 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* obj) {
+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);
@@ -1187,7 +1195,7 @@ static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* ob
 	_g_free0 (self->blog);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->url);
-#line 1191 "TumblrPublishing.c"
+#line 1199 "TumblrPublishing.c"
 }
 
 
@@ -1206,18 +1214,18 @@ GType publishing_tumblr_blog_entry_get_type (void) {
 
 
 gpointer publishing_tumblr_blog_entry_ref (gpointer instance) {
-	PublishingTumblrBlogEntry* self;
+	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 1216 "TumblrPublishing.c"
+#line 1224 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_blog_entry_unref (gpointer instance) {
-	PublishingTumblrBlogEntry* self;
+	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)) {
@@ -1225,16 +1233,16 @@ void publishing_tumblr_blog_entry_unref (gpointer instance) {
 		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 1229 "TumblrPublishing.c"
+#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_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	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"
@@ -1253,21 +1261,21 @@ PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_
 	self->size = _tmp2_;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 1257 "TumblrPublishing.c"
+#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 1264 "TumblrPublishing.c"
+#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 1271 "TumblrPublishing.c"
+#line 1279 "TumblrPublishing.c"
 }
 
 
@@ -1276,7 +1284,7 @@ static void publishing_tumblr_value_size_entry_free_value (GValue* value) {
 	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 1280 "TumblrPublishing.c"
+#line 1288 "TumblrPublishing.c"
 	}
 }
 
@@ -1286,11 +1294,11 @@ static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_val
 	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 1290 "TumblrPublishing.c"
+#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 1294 "TumblrPublishing.c"
+#line 1302 "TumblrPublishing.c"
 	}
 }
 
@@ -1298,66 +1306,66 @@ static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_val
 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 1302 "TumblrPublishing.c"
+#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 1309 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry* object;
+#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 1316 "TumblrPublishing.c"
+#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 1320 "TumblrPublishing.c"
+#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 1324 "TumblrPublishing.c"
+#line 1332 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1328 "TumblrPublishing.c"
+#line 1336 "TumblrPublishing.c"
 	}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1332 "TumblrPublishing.c"
+#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;
+	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 1343 "TumblrPublishing.c"
+#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 1349 "TumblrPublishing.c"
+#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 1353 "TumblrPublishing.c"
+#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 1357 "TumblrPublishing.c"
+#line 1365 "TumblrPublishing.c"
 	}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1361 "TumblrPublishing.c"
+#line 1369 "TumblrPublishing.c"
 }
 
 
@@ -1371,7 +1379,7 @@ GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gc
 	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 1375 "TumblrPublishing.c"
+#line 1383 "TumblrPublishing.c"
 }
 
 
@@ -1380,12 +1388,12 @@ gpointer publishing_tumblr_value_get_size_entry (const GValue* value) {
 	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 1384 "TumblrPublishing.c"
+#line 1392 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry* old;
+	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"
@@ -1400,23 +1408,23 @@ void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
 		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 1404 "TumblrPublishing.c"
+#line 1412 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1408 "TumblrPublishing.c"
+#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 1414 "TumblrPublishing.c"
+#line 1422 "TumblrPublishing.c"
 	}
 }
 
 
 void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry* old;
+	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"
@@ -1429,17 +1437,17 @@ void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1433 "TumblrPublishing.c"
+#line 1441 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1437 "TumblrPublishing.c"
+#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 1443 "TumblrPublishing.c"
+#line 1451 "TumblrPublishing.c"
 	}
 }
 
@@ -1449,18 +1457,18 @@ static void publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryCl
 	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 1453 "TumblrPublishing.c"
+#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 1460 "TumblrPublishing.c"
+#line 1468 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* obj) {
+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);
@@ -1468,7 +1476,7 @@ static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* ob
 	g_signal_handlers_destroy (self);
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->title);
-#line 1472 "TumblrPublishing.c"
+#line 1480 "TumblrPublishing.c"
 }
 
 
@@ -1487,18 +1495,18 @@ GType publishing_tumblr_size_entry_get_type (void) {
 
 
 gpointer publishing_tumblr_size_entry_ref (gpointer instance) {
-	PublishingTumblrSizeEntry* self;
+	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 1497 "TumblrPublishing.c"
+#line 1505 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_size_entry_unref (gpointer instance) {
-	PublishingTumblrSizeEntry* self;
+	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)) {
@@ -1506,7 +1514,7 @@ void publishing_tumblr_size_entry_unref (gpointer instance) {
 		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 1510 "TumblrPublishing.c"
+#line 1518 "TumblrPublishing.c"
 	}
 }
 
@@ -1514,81 +1522,78 @@ void publishing_tumblr_size_entry_unref (gpointer instance) {
 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 1518 "TumblrPublishing.c"
+#line 1526 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add18 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+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 1529 "TumblrPublishing.c"
+#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 1535 "TumblrPublishing.c"
+#line 1543 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add19 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+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 1546 "TumblrPublishing.c"
+#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 1552 "TumblrPublishing.c"
+#line 1560 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add20 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+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 1563 "TumblrPublishing.c"
+#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 1569 "TumblrPublishing.c"
+#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_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingTumblrSizeEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingTumblrSizeEntry* _tmp3_ = NULL;
-	PublishingTumblrSizeEntry** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingTumblrSizeEntry* _tmp6_ = NULL;
-	PublishingTumblrSizeEntry** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingTumblrSizeEntry* _tmp9_ = NULL;
-	PublishingTumblrSizeEntry** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	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"
@@ -1604,57 +1609,51 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _ ("500 × 375 pixels");
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publishing_tumblr_size_entry_new (_tmp2_, 500);
+	_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_, _tmp3_);
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _result_;
+	_tmp3_ = _result_;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3__length1 = _result__length1;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _ ("1024 × 768 pixels");
+	_tmp4_ = publishing_tumblr_size_entry_new (_ ("1024 × 768 pixels"), 1024);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_size_entry_new (_tmp5_, 1024);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _result_;
+	_tmp5_ = _result_;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5__length1 = _result__length1;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = _ ("1280 × 853 pixels");
+	_tmp6_ = publishing_tumblr_size_entry_new (_ ("1280 × 853 pixels"), 1280);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = publishing_tumblr_size_entry_new (_tmp8_, 1280);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = _result_;
+	_tmp7_ = _result_;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_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 = _tmp10__length1;
-#line 1641 "TumblrPublishing.c"
+		*result_length1 = _tmp7__length1;
+#line 1640 "TumblrPublishing.c"
 	}
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp10_;
+	result = _tmp7_;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1647 "TumblrPublishing.c"
+#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_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingTumblrBlogEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	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"
@@ -1673,28 +1672,28 @@ static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blo
 	if (result_length1) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 1677 "TumblrPublishing.c"
+#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 1683 "TumblrPublishing.c"
+#line 1682 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingTumblrTumblrPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	PublishingTumblrSizeEntry** _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	PublishingTumblrBlogEntry** _tmp8_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp9_ = 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"
@@ -1751,14 +1750,14 @@ PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (G
 	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 1755 "TumblrPublishing.c"
+#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 1762 "TumblrPublishing.c"
+#line 1761 "TumblrPublishing.c"
 }
 
 
@@ -1769,15 +1768,15 @@ static void publishing_tumblr_tumblr_publisher_invalidate_persistent_session (Pu
 	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 1773 "TumblrPublishing.c"
+#line 1772 "TumblrPublishing.c"
 }
 
 
 static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingTumblrTumblrPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = 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"
@@ -1788,14 +1787,14 @@ static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_servic
 	result = _tmp1_;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1792 "TumblrPublishing.c"
+#line 1791 "TumblrPublishing.c"
 }
 
 
 SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = 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"
@@ -1806,14 +1805,14 @@ SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (Publishin
 	result = _tmp1_;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1810 "TumblrPublishing.c"
+#line 1809 "TumblrPublishing.c"
 }
 
 
 static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingTumblrTumblrPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = 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"
@@ -1822,20 +1821,20 @@ static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1826 "TumblrPublishing.c"
+#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_ = NULL;
+	gchar* _tmp0_;
 	gchar* access_phase_token_secret = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp3_;
 	gboolean valid = FALSE;
-	gboolean _tmp5_ = 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"
@@ -1850,17 +1849,17 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (
 	_tmp3_ = access_phase_token;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp3_ != NULL) {
-#line 1854 "TumblrPublishing.c"
-		const gchar* _tmp4_ = 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 1860 "TumblrPublishing.c"
+#line 1859 "TumblrPublishing.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp2_ = FALSE;
-#line 1864 "TumblrPublishing.c"
+#line 1863 "TumblrPublishing.c"
 	}
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	valid = _tmp2_;
@@ -1871,11 +1870,11 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (
 #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 1874 "TumblrPublishing.c"
+#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 1878 "TumblrPublishing.c"
+#line 1877 "TumblrPublishing.c"
 	}
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = valid;
@@ -1885,14 +1884,14 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (
 	_g_free0 (access_phase_token);
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1888 "TumblrPublishing.c"
+#line 1887 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = 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"
@@ -1903,13 +1902,13 @@ gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (Pub
 	result = _tmp1_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1906 "TumblrPublishing.c"
+#line 1905 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -1918,14 +1917,14 @@ static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token
 	_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 1921 "TumblrPublishing.c"
+#line 1920 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = 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"
@@ -1936,13 +1935,13 @@ gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secr
 	result = _tmp1_;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1939 "TumblrPublishing.c"
+#line 1938 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self, const gchar* token_secret) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -1951,14 +1950,14 @@ static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token
 	_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 1954 "TumblrPublishing.c"
+#line 1953 "TumblrPublishing.c"
 }
 
 
 gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 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"
@@ -1969,13 +1968,13 @@ gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingT
 	result = _tmp1_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1972 "TumblrPublishing.c"
+#line 1971 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	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"
@@ -1984,14 +1983,14 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingT
 	_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 1987 "TumblrPublishing.c"
+#line 1986 "TumblrPublishing.c"
 }
 
 
 gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 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"
@@ -2002,13 +2001,13 @@ gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingT
 	result = _tmp1_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 2005 "TumblrPublishing.c"
+#line 2004 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	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"
@@ -2017,7 +2016,7 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingT
 	_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 2020 "TumblrPublishing.c"
+#line 2019 "TumblrPublishing.c"
 }
 
 
@@ -2035,19 +2034,19 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingT
 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 2038 "TumblrPublishing.c"
+#line 2037 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (PublishingTumblrTumblrPublisher* self, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingTumblrTumblrPublisherAuthenticationPane* authentication_pane = NULL;
-	PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp1_ = 0;
-	PublishingTumblrTumblrPublisherAuthenticationPane* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = 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"
@@ -2080,7 +2079,7 @@ static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (Publ
 	_g_object_unref0 (_tmp6_);
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 2083 "TumblrPublishing.c"
+#line 2082 "TumblrPublishing.c"
 }
 
 
@@ -2095,9 +2094,9 @@ static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (Publ
      * @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_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	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"
@@ -2112,7 +2111,7 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic
 	if (!_tmp0_) {
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2115 "TumblrPublishing.c"
+#line 2114 "TumblrPublishing.c"
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = username;
@@ -2120,7 +2119,7 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic
 	_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 2123 "TumblrPublishing.c"
+#line 2122 "TumblrPublishing.c"
 }
 
 
@@ -2135,25 +2134,25 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic
 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 2138 "TumblrPublishing.c"
+#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 2145 "TumblrPublishing.c"
+#line 2144 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* _tmp5_ = 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));
@@ -2185,7 +2184,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 	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 2188 "TumblrPublishing.c"
+#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_);
@@ -2193,7 +2192,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 		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 2196 "TumblrPublishing.c"
+#line 2195 "TumblrPublishing.c"
 				goto __catch32_spit_publishing_publishing_error;
 			}
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2204,15 +2203,15 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 			g_clear_error (&_inner_error_);
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 2207 "TumblrPublishing.c"
+#line 2206 "TumblrPublishing.c"
 		}
 	}
 	goto __finally32;
 	__catch32_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp6_ = NULL;
-		GError* _tmp7_ = 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"
@@ -2225,7 +2224,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 		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 2228 "TumblrPublishing.c"
+#line 2227 "TumblrPublishing.c"
 	}
 	__finally32:
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2238,26 +2237,26 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 		g_clear_error (&_inner_error_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2241 "TumblrPublishing.c"
+#line 2240 "TumblrPublishing.c"
 	}
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2245 "TumblrPublishing.c"
+#line 2244 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	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"
@@ -2280,7 +2279,7 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (Pu
 	if (!_tmp4_) {
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2283 "TumblrPublishing.c"
+#line 2282 "TumblrPublishing.c"
 	}
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = txn;
@@ -2303,18 +2302,18 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (Pu
 	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 2305 "TumblrPublishing.c"
+#line 2304 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
+	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"
@@ -2337,7 +2336,7 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (Publis
 	if (!_tmp4_) {
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2339 "TumblrPublishing.c"
+#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" \
@@ -2348,27 +2347,27 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (Publis
 	_tmp6_ = err;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2349 "TumblrPublishing.c"
+#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_ = NULL;
+	const gchar* _tmp0_;
 	gchar* oauth_token = NULL;
 	gchar* oauth_token_secret = NULL;
 	gchar** key_value_pairs = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint key_value_pairs_length1 = 0;
-	gint _key_value_pairs_size_ = 0;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gboolean _tmp25_ = FALSE;
-	const gchar* _tmp26_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	const gchar* _tmp35_ = 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"
@@ -2396,7 +2395,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 	_tmp4_ = key_value_pairs;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4__length1 = key_value_pairs_length1;
-#line 2396 "TumblrPublishing.c"
+#line 2395 "TumblrPublishing.c"
 	{
 		gchar** pair_collection = NULL;
 		gint pair_collection_length1 = 0;
@@ -2408,26 +2407,26 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 		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 2408 "TumblrPublishing.c"
-			gchar* _tmp5_ = NULL;
+#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 2415 "TumblrPublishing.c"
+#line 2414 "TumblrPublishing.c"
 			{
 				gchar** split_pair = NULL;
-				const gchar* _tmp6_ = NULL;
-				gchar** _tmp7_ = NULL;
-				gchar** _tmp8_ = NULL;
-				gint split_pair_length1 = 0;
-				gint _split_pair_size_ = 0;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gchar** _tmp15_ = NULL;
-				gint _tmp15__length1 = 0;
-				const gchar* _tmp16_ = 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"
@@ -2444,159 +2443,153 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 				_tmp9__length1 = split_pair_length1;
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp9__length1 != 2) {
-#line 2444 "TumblrPublishing.c"
-					SpitPublishingPluginHost* _tmp10_ = NULL;
-					const gchar* _tmp11_ = NULL;
-					const gchar* _tmp12_ = NULL;
-					GError* _tmp13_ = NULL;
-					GError* _tmp14_ = NULL;
+#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_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp12_ = response;
+					_tmp11_ = response;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp13_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_, _tmp12_);
+					_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"
-					_tmp14_ = _tmp13_;
+					_tmp13_ = _tmp12_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					spit_publishing_plugin_host_post_error (_tmp10_, _tmp14_);
+					spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_error_free0 (_tmp14_);
-#line 2464 "TumblrPublishing.c"
+					_g_error_free0 (_tmp13_);
+#line 2460 "TumblrPublishing.c"
 				}
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = split_pair;
+				_tmp14_ = split_pair;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15__length1 = split_pair_length1;
+				_tmp14__length1 = split_pair_length1;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = _tmp15_[0];
+				_tmp15_ = _tmp14_[0];
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (g_strcmp0 (_tmp16_, "oauth_token") == 0) {
-#line 2474 "TumblrPublishing.c"
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-					const gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
+				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"
-					_tmp17_ = split_pair;
+					_tmp16_ = split_pair;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17__length1 = split_pair_length1;
+					_tmp16__length1 = split_pair_length1;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp18_ = _tmp17_[1];
+					_tmp17_ = _tmp16_[1];
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19_ = g_strdup (_tmp18_);
+					_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 = _tmp19_;
-#line 2491 "TumblrPublishing.c"
+					oauth_token = _tmp18_;
+#line 2487 "TumblrPublishing.c"
 				} else {
-					gchar** _tmp20_ = NULL;
-					gint _tmp20__length1 = 0;
-					const gchar* _tmp21_ = NULL;
+					gchar** _tmp19_;
+					gint _tmp19__length1;
+					const gchar* _tmp20_;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20_ = split_pair;
+					_tmp19_ = split_pair;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20__length1 = split_pair_length1;
+					_tmp19__length1 = split_pair_length1;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp21_ = _tmp20_[0];
+					_tmp20_ = _tmp19_[0];
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					if (g_strcmp0 (_tmp21_, "oauth_token_secret") == 0) {
-#line 2504 "TumblrPublishing.c"
-						gchar** _tmp22_ = NULL;
-						gint _tmp22__length1 = 0;
-						const gchar* _tmp23_ = NULL;
-						gchar* _tmp24_ = NULL;
+					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"
-						_tmp22_ = split_pair;
+						_tmp21_ = split_pair;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp22__length1 = split_pair_length1;
+						_tmp21__length1 = split_pair_length1;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp23_ = _tmp22_[1];
+						_tmp22_ = _tmp21_[1];
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp24_ = g_strdup (_tmp23_);
+						_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 = _tmp24_;
-#line 2521 "TumblrPublishing.c"
+						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 2528 "TumblrPublishing.c"
+#line 2524 "TumblrPublishing.c"
 			}
 		}
 	}
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp26_ = oauth_token;
+	_tmp25_ = oauth_token;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp26_ == NULL) {
+	if (_tmp25_ == NULL) {
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = TRUE;
-#line 2538 "TumblrPublishing.c"
+		_tmp24_ = TRUE;
+#line 2534 "TumblrPublishing.c"
 	} else {
-		const gchar* _tmp27_ = NULL;
+		const gchar* _tmp26_;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = oauth_token_secret;
+		_tmp26_ = oauth_token_secret;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = _tmp27_ == NULL;
-#line 2545 "TumblrPublishing.c"
+		_tmp24_ = _tmp26_ == NULL;
+#line 2541 "TumblrPublishing.c"
 	}
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp25_) {
-#line 2549 "TumblrPublishing.c"
-		SpitPublishingPluginHost* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		GError* _tmp31_ = NULL;
-		GError* _tmp32_ = NULL;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = self->priv->host;
+	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"
-		_tmp29_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
+		_tmp27_ = self->priv->host;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = response;
+		_tmp28_ = response;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp29_, _tmp30_);
+		_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"
-		_tmp32_ = _tmp31_;
+		_tmp30_ = _tmp29_;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp28_, _tmp32_);
+		spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (_tmp32_);
-#line 2569 "TumblrPublishing.c"
+		_g_error_free0 (_tmp30_);
+#line 2562 "TumblrPublishing.c"
 	}
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = self->priv->session;
+	_tmp31_ = self->priv->session;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = oauth_token;
+	_tmp32_ = oauth_token;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp35_ = oauth_token_secret;
+	_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 (_tmp33_, _tmp34_, _tmp35_);
+	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 2585 "TumblrPublishing.c"
+#line 2578 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	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"
@@ -2605,7 +2598,7 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish
 	if (!_tmp0_) {
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2605 "TumblrPublishing.c"
+#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" \
@@ -2632,28 +2625,28 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish
 	_g_free0 (_tmp6_);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_get_blogs (self);
-#line 2631 "TumblrPublishing.c"
+#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 2638 "TumblrPublishing.c"
+#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 2645 "TumblrPublishing.c"
+#line 2638 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self) {
 	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_ = 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));
@@ -2669,7 +2662,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 	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 2668 "TumblrPublishing.c"
+#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_);
@@ -2677,7 +2670,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		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 2676 "TumblrPublishing.c"
+#line 2669 "TumblrPublishing.c"
 				goto __catch33_spit_publishing_publishing_error;
 			}
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2688,15 +2681,15 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 			g_clear_error (&_inner_error_);
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 2687 "TumblrPublishing.c"
+#line 2680 "TumblrPublishing.c"
 		}
 	}
 	goto __finally33;
 	__catch33_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp2_ = NULL;
-		GError* _tmp3_ = 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"
@@ -2709,7 +2702,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		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 2708 "TumblrPublishing.c"
+#line 2701 "TumblrPublishing.c"
 	}
 	__finally33:
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2722,26 +2715,26 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		g_clear_error (&_inner_error_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2721 "TumblrPublishing.c"
+#line 2714 "TumblrPublishing.c"
 	}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2725 "TumblrPublishing.c"
+#line 2718 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	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"
@@ -2764,7 +2757,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu
 	if (!_tmp4_) {
 #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2763 "TumblrPublishing.c"
+#line 2756 "TumblrPublishing.c"
 	}
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = txn;
@@ -2789,156 +2782,198 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu
 	_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 2787 "TumblrPublishing.c"
+#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 2794 "TumblrPublishing.c"
+#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 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 2807 "TumblrPublishing.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 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* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2838 "TumblrPublishing.c"
+#line 2873 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2847 "TumblrPublishing.c"
+#line 2882 "TumblrPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2863 "TumblrPublishing.c"
+#line 2898 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2874 "TumblrPublishing.c"
+#line 2909 "TumblrPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2888 "TumblrPublishing.c"
+#line 2923 "TumblrPublishing.c"
 	}
 	goto __finally35;
 	__catch35_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2902 "TumblrPublishing.c"
+#line 2937 "TumblrPublishing.c"
 	}
 	__finally35:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2913 "TumblrPublishing.c"
+#line 2948 "TumblrPublishing.c"
 	}
 }
 
 
-static void _vala_array_add21 (PublishingTumblrBlogEntry*** array, int* length, int* size, PublishingTumblrBlogEntry* value) {
+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 2925 "TumblrPublishing.c"
+#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 2931 "TumblrPublishing.c"
+#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_ = NULL;
+	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));
@@ -2949,26 +2984,26 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 #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 2946 "TumblrPublishing.c"
+#line 2981 "TumblrPublishing.c"
 	{
 		JsonParser* parser = NULL;
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		JsonParser* _tmp1_;
+		const gchar* _tmp2_;
 		JsonObject* root_object = NULL;
-		JsonNode* _tmp3_ = NULL;
-		JsonObject* _tmp4_ = NULL;
-		JsonObject* _tmp5_ = NULL;
-		JsonObject* _tmp6_ = NULL;
-		JsonObject* _tmp7_ = NULL;
-		JsonObject* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		JsonObject* _tmp12_ = NULL;
-		JsonObject* _tmp13_ = NULL;
-		JsonObject* _tmp14_ = NULL;
-		JsonArray* _tmp15_ = NULL;
-		GList* _tmp16_ = 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"
@@ -2981,7 +3016,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2978 "TumblrPublishing.c"
+#line 3013 "TumblrPublishing.c"
 			goto __catch34_g_error;
 		}
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3020,7 +3055,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		_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 3017 "TumblrPublishing.c"
+#line 3052 "TumblrPublishing.c"
 		{
 			GList* blognode_collection = NULL;
 			GList* blognode_it = NULL;
@@ -3028,34 +3063,34 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 			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 3025 "TumblrPublishing.c"
+#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 3029 "TumblrPublishing.c"
+#line 3064 "TumblrPublishing.c"
 				{
 					JsonObject* blog = NULL;
-					JsonNode* _tmp17_ = NULL;
-					JsonObject* _tmp18_ = NULL;
-					JsonObject* _tmp19_ = NULL;
+					JsonNode* _tmp17_;
+					JsonObject* _tmp18_;
+					JsonObject* _tmp19_;
 					gchar* name = NULL;
-					JsonObject* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					gchar* _tmp22_ = NULL;
+					JsonObject* _tmp20_;
+					const gchar* _tmp21_;
+					gchar* _tmp22_;
 					gchar* url = NULL;
-					JsonObject* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gchar* _tmp25_ = NULL;
-					gchar* _tmp26_ = NULL;
-					gchar* _tmp27_ = NULL;
-					gchar* _tmp28_ = NULL;
-					const gchar* _tmp29_ = NULL;
-					const gchar* _tmp30_ = NULL;
-					PublishingTumblrBlogEntry** _tmp31_ = NULL;
-					gint _tmp31__length1 = 0;
-					const gchar* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					PublishingTumblrBlogEntry* _tmp34_ = 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"
@@ -3112,25 +3147,25 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 					_g_free0 (name);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_json_object_unref0 (blog);
-#line 3109 "TumblrPublishing.c"
+#line 3144 "TumblrPublishing.c"
 				}
 			}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_list_free0 (blognode_collection);
-#line 3114 "TumblrPublishing.c"
+#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 3120 "TumblrPublishing.c"
+#line 3155 "TumblrPublishing.c"
 	}
 	goto __finally34;
 	__catch34_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp35_ = NULL;
-		GError* _tmp36_ = 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"
@@ -3143,7 +3178,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		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 3140 "TumblrPublishing.c"
+#line 3175 "TumblrPublishing.c"
 	}
 	__finally34:
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3154,20 +3189,20 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		g_clear_error (&_inner_error_);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3151 "TumblrPublishing.c"
+#line 3186 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	GError* _tmp7_ = NULL;
+	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"
@@ -3190,7 +3225,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 	if (!_tmp4_) {
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3187 "TumblrPublishing.c"
+#line 3222 "TumblrPublishing.c"
 	}
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = self->priv->session;
@@ -3207,36 +3242,36 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 	_tmp7_ = err;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 3203 "TumblrPublishing.c"
+#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 3210 "TumblrPublishing.c"
+#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 3217 "TumblrPublishing.c"
+#line 3252 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPublisherMediaType _tmp2_ = 0;
-	PublishingTumblrSizeEntry** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PublishingTumblrBlogEntry** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = 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"
@@ -3273,24 +3308,24 @@ static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (
 	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 3269 "TumblrPublishing.c"
+#line 3304 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	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 3282 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
+#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"
@@ -3303,7 +3338,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
 		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 3299 "TumblrPublishing.c"
+#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));
@@ -3311,31 +3346,31 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
 	if (!_tmp5_) {
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3307 "TumblrPublishing.c"
+#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 3313 "TumblrPublishing.c"
+#line 3348 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	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 3326 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
+#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"
@@ -3348,7 +3383,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
 		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 3343 "TumblrPublishing.c"
+#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));
@@ -3356,27 +3391,27 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
 	if (!_tmp5_) {
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3351 "TumblrPublishing.c"
+#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 3357 "TumblrPublishing.c"
+#line 3392 "TumblrPublishing.c"
 }
 
 
 gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
 	gint result = 0;
-	SpitPublishingPublishable* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
-	GDateTime* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	GDateTime* _tmp4_ = NULL;
-	GDateTime* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 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"
@@ -3405,7 +3440,7 @@ gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPubli
 	result = _tmp7_;
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 3399 "TumblrPublishing.c"
+#line 3434 "TumblrPublishing.c"
 }
 
 
@@ -3414,74 +3449,74 @@ static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gc
 	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 3408 "TumblrPublishing.c"
+#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 3415 "TumblrPublishing.c"
+#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 3422 "TumblrPublishing.c"
+#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 3429 "TumblrPublishing.c"
+#line 3464 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingTumblrSizeEntry** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	PublishingTumblrSizeEntry* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	void* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	SpitPublishingProgressCallback _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	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_ = NULL;
-	gint _tmp11_ = 0;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp10_;
+	gint _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	GeeArrayList* sorted_list = NULL;
-	GeeArrayList* _tmp13_ = NULL;
-	SpitPublishingPublishable** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	GeeArrayList* _tmp18_ = NULL;
+	GeeArrayList* _tmp13_;
+	SpitPublishingPublishable** _tmp14_;
+	gint _tmp14__length1;
+	GeeArrayList* _tmp18_;
 	gchar* blog_url = NULL;
-	PublishingTumblrBlogEntry** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gint _tmp20_ = 0;
-	PublishingTumblrBlogEntry* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
+	PublishingTumblrBlogEntry** _tmp19_;
+	gint _tmp19__length1;
+	gint _tmp20_;
+	PublishingTumblrBlogEntry* _tmp21_;
+	const gchar* _tmp22_;
+	gchar* _tmp23_;
 	PublishingTumblrTumblrPublisherUploader* uploader = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp24_ = NULL;
-	GeeArrayList* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	gpointer* _tmp27_ = NULL;
-	SpitPublishingPublishable** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	const gchar* _tmp29_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp30_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp31_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp32_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp33_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp34_ = 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"
@@ -3525,7 +3560,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	if (!_tmp9_) {
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3518 "TumblrPublishing.c"
+#line 3553 "TumblrPublishing.c"
 	}
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp10_ = self->priv->host;
@@ -3545,7 +3580,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	_tmp14_ = publishables;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp14__length1 = publishables_length1;
-#line 3538 "TumblrPublishing.c"
+#line 3573 "TumblrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -3557,17 +3592,17 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 		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 3550 "TumblrPublishing.c"
-			SpitPublishingPublishable* _tmp15_ = NULL;
+#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 3557 "TumblrPublishing.c"
+#line 3592 "TumblrPublishing.c"
 			{
-				GeeArrayList* _tmp16_ = NULL;
-				SpitPublishingPublishable* _tmp17_ = NULL;
+				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"
@@ -3578,7 +3613,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 				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 3571 "TumblrPublishing.c"
+#line 3606 "TumblrPublishing.c"
 			}
 		}
 	}
@@ -3640,13 +3675,13 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	_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 3633 "TumblrPublishing.c"
+#line 3668 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	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"
@@ -3659,19 +3694,19 @@ static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingT
 	_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 3652 "TumblrPublishing.c"
+#line 3687 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_ = FALSE;
-	gdouble _tmp1_ = 0.0;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	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"
@@ -3680,7 +3715,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish
 	if (!_tmp0_) {
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3673 "TumblrPublishing.c"
+#line 3708 "TumblrPublishing.c"
 	}
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -3703,17 +3738,17 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish
 	_tmp5_ = completed_fraction;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 3695 "TumblrPublishing.c"
+#line 3730 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	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"
@@ -3724,7 +3759,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum
 	if (!_tmp0_) {
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3716 "TumblrPublishing.c"
+#line 3751 "TumblrPublishing.c"
 	}
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = num_published;
@@ -3745,20 +3780,20 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum
 	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 3736 "TumblrPublishing.c"
+#line 3771 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	gboolean _tmp0_ = FALSE;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportBatchUploader* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
+	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"
@@ -3769,7 +3804,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr
 	if (!_tmp0_) {
 #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3760 "TumblrPublishing.c"
+#line 3795 "TumblrPublishing.c"
 	}
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = err;
@@ -3796,12 +3831,12 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr
 	_tmp8_ = err;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 3786 "TumblrPublishing.c"
+#line 3821 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
+	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"
@@ -3817,13 +3852,13 @@ static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblr
 	self->priv->running = FALSE;
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3806 "TumblrPublishing.c"
+#line 3841 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -3832,7 +3867,7 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 	if (_tmp0_) {
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3821 "TumblrPublishing.c"
+#line 3856 "TumblrPublishing.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:539: TumblrPublisher: starting interaction.");
@@ -3842,12 +3877,12 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 	_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 3831 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#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");
@@ -3867,22 +3902,22 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 		_g_free0 (_tmp6_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp4_);
-#line 3855 "TumblrPublishing.c"
+#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 3861 "TumblrPublishing.c"
+#line 3896 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingTumblrTumblrPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -3891,26 +3926,22 @@ static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3878 "TumblrPublishing.c"
+#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 3884 "TumblrPublishing.c"
-		const gchar* _tmp2_ = NULL;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
-"ble.");
 #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_error ("TumblrPublishing.vala:559: %s", _tmp2_);
-#line 3890 "TumblrPublishing.c"
+		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 3896 "TumblrPublishing.c"
+#line 3927 "TumblrPublishing.c"
 }
 
 
@@ -3922,7 +3953,7 @@ static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublishe
 	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 3908 "TumblrPublishing.c"
+#line 3939 "TumblrPublishing.c"
 }
 
 
@@ -3941,27 +3972,27 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void
 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 3927 "TumblrPublishing.c"
+#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 3934 "TumblrPublishing.c"
+#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 3941 "TumblrPublishing.c"
+#line 3972 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self = NULL;
-	GtkBox* _tmp0_ = 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);
@@ -3975,42 +4006,42 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 	_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 3961 "TumblrPublishing.c"
+#line 3992 "TumblrPublishing.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GtkBuilder* _tmp3_ = NULL;
+		GtkBuilder* _tmp1_;
+		GtkBuilder* _tmp2_;
+		GtkBuilder* _tmp3_;
 		GtkWidget* content = NULL;
-		GtkBuilder* _tmp4_ = NULL;
-		GObject* _tmp5_ = NULL;
-		GtkWidget* _tmp6_ = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GtkWidget* _tmp6_;
 		GtkLabel* message_label = NULL;
-		GtkBuilder* _tmp7_ = NULL;
-		GObject* _tmp8_ = NULL;
-		GtkLabel* _tmp9_ = NULL;
-		PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp10_ = 0;
-		GtkBuilder* _tmp18_ = NULL;
-		GObject* _tmp19_ = NULL;
-		GtkEntry* _tmp20_ = NULL;
-		GtkBuilder* _tmp21_ = NULL;
-		GObject* _tmp22_ = NULL;
-		GtkEntry* _tmp23_ = NULL;
-		GtkBuilder* _tmp24_ = NULL;
-		GObject* _tmp25_ = NULL;
-		GtkButton* _tmp26_ = NULL;
-		GtkEntry* _tmp27_ = NULL;
-		GtkEntry* _tmp28_ = NULL;
-		GtkButton* _tmp29_ = NULL;
-		GtkWidget* _tmp30_ = NULL;
-		GtkContainer* _tmp31_ = NULL;
-		GtkContainer* _tmp32_ = NULL;
-		GtkWidget* _tmp33_ = NULL;
-		GtkBox* _tmp34_ = NULL;
-		GtkWidget* _tmp35_ = NULL;
-		PublishingTumblrTumblrPublisher* _tmp36_ = NULL;
-		SpitPublishingPluginHost* _tmp37_ = NULL;
-		SpitPublishingPluginHost* _tmp38_ = NULL;
-		GtkButton* _tmp39_ = 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"
@@ -4023,7 +4054,7 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		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 4009 "TumblrPublishing.c"
+#line 4040 "TumblrPublishing.c"
 			goto __catch36_g_error;
 		}
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4052,10 +4083,10 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		switch (_tmp10_) {
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO:
-#line 4038 "TumblrPublishing.c"
+#line 4069 "TumblrPublishing.c"
 			{
-				GtkLabel* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+				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"
@@ -4064,138 +4095,132 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 				gtk_label_set_text (_tmp11_, _tmp12_);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				break;
-#line 4050 "TumblrPublishing.c"
+#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 4054 "TumblrPublishing.c"
+#line 4085 "TumblrPublishing.c"
 			{
-				GtkLabel* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
+				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_ = _ ("Invalid User Name or Password");
+				_tmp14_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+				_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_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_);
+				_tmp16_ = _tmp15_;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp17_ = _tmp16_;
+				gtk_label_set_markup (_tmp13_, _tmp16_);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gtk_label_set_markup (_tmp13_, _tmp17_);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp17_);
+				_g_free0 (_tmp16_);
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				break;
-#line 4077 "TumblrPublishing.c"
+#line 4105 "TumblrPublishing.c"
 			}
 			default:
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			break;
-#line 4082 "TumblrPublishing.c"
+#line 4110 "TumblrPublishing.c"
 		}
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = self->priv->builder;
+		_tmp17_ = self->priv->builder;
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = gtk_builder_get_object (_tmp18_, "username_entry");
+		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp19_) : NULL);
+		_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 = _tmp20_;
+		self->priv->username_entry = _tmp19_;
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = self->priv->builder;
+		_tmp20_ = self->priv->builder;
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = gtk_builder_get_object (_tmp21_, "password_entry");
+		_tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry");
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp22_) : NULL);
+		_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 = _tmp23_;
+		self->priv->password_entry = _tmp22_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = self->priv->builder;
+		_tmp23_ = self->priv->builder;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = gtk_builder_get_object (_tmp24_, "login_button");
+		_tmp24_ = gtk_builder_get_object (_tmp23_, "login_button");
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
+		_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 = _tmp26_;
+		self->priv->login_button = _tmp25_;
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = self->priv->username_entry;
+		_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 (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+		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"
-		_tmp28_ = self->priv->password_entry;
+		_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 (_tmp28_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+		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"
-		_tmp29_ = self->priv->login_button;
+		_tmp28_ = self->priv->login_button;
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp29_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+		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"
-		_tmp30_ = content;
+		_tmp29_ = content;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = gtk_widget_get_parent (_tmp30_);
+		_tmp30_ = gtk_widget_get_parent (_tmp29_);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = _tmp31_;
+		_tmp31_ = _tmp30_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = content;
+		_tmp32_ = content;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_remove (_tmp32_, _tmp33_);
+		gtk_container_remove (_tmp31_, _tmp32_);
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp34_ = self->priv->pane_widget;
+		_tmp33_ = self->priv->pane_widget;
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = content;
+		_tmp34_ = content;
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), _tmp35_);
+		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"
-		_tmp36_ = publisher;
+		_tmp35_ = publisher;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = publishing_tumblr_tumblr_publisher_get_host (_tmp36_);
+		_tmp36_ = publishing_tumblr_tumblr_publisher_get_host (_tmp35_);
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = _tmp37_;
+		_tmp37_ = _tmp36_;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = self->priv->login_button;
+		_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 (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+		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 (_tmp38_);
+		_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 4158 "TumblrPublishing.c"
+#line 4186 "TumblrPublishing.c"
 	}
 	goto __finally36;
 	__catch36_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp40_ = NULL;
-		GError* _tmp41_ = NULL;
-		const gchar* _tmp42_ = 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"
-		_tmp40_ = _ ("Could not load UI: %s");
+		_tmp39_ = e;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp41_ = e;
+		_tmp40_ = _tmp39_->message;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp42_ = _tmp41_->message;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_tmp40_, _tmp42_);
+		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 4181 "TumblrPublishing.c"
+#line 4206 "TumblrPublishing.c"
 	}
 	__finally36:
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4206,25 +4231,25 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		g_clear_error (&_inner_error_);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return NULL;
-#line 4192 "TumblrPublishing.c"
+#line 4217 "TumblrPublishing.c"
 	}
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 4196 "TumblrPublishing.c"
+#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 4203 "TumblrPublishing.c"
+#line 4228 "TumblrPublishing.c"
 }
 
 
 GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
 	GtkWidget* result = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = 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"
@@ -4235,15 +4260,15 @@ GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_wi
 	result = _tmp1_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4221 "TumblrPublishing.c"
+#line 4246 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	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"
@@ -4255,8 +4280,8 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_butt
 #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_by_name (self, "login", _tmp1_, _tmp3_);
-#line 4242 "TumblrPublishing.c"
+	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"
 }
 
 
@@ -4265,7 +4290,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_chang
 	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 4251 "TumblrPublishing.c"
+#line 4276 "TumblrPublishing.c"
 }
 
 
@@ -4274,16 +4299,16 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_c
 	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 4260 "TumblrPublishing.c"
+#line 4285 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
 	gboolean _tmp0_ = FALSE;
-	GtkEntry* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	GtkButton* _tmp7_ = NULL;
+	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"
@@ -4294,10 +4319,10 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_
 	_tmp3_ = _tmp2_;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp3_ > ((guint) 0)) {
-#line 4280 "TumblrPublishing.c"
-		GtkEntry* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-		guint _tmp6_ = 0U;
+#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"
@@ -4306,25 +4331,25 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_
 		_tmp6_ = _tmp5_;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 4292 "TumblrPublishing.c"
+#line 4317 "TumblrPublishing.c"
 	} else {
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 4296 "TumblrPublishing.c"
+#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 4302 "TumblrPublishing.c"
+#line 4327 "TumblrPublishing.c"
 }
 
 
 static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = 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"
@@ -4335,7 +4360,7 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_ge
 	result = _tmp1_;
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4321 "TumblrPublishing.c"
+#line 4346 "TumblrPublishing.c"
 }
 
 
@@ -4348,15 +4373,15 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4334 "TumblrPublishing.c"
+#line 4359 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	GtkEntry* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	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"
@@ -4373,7 +4398,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_
 	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 4359 "TumblrPublishing.c"
+#line 4384 "TumblrPublishing.c"
 }
 
 
@@ -4381,7 +4406,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_
 	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 4367 "TumblrPublishing.c"
+#line 4392 "TumblrPublishing.c"
 }
 
 
@@ -4400,27 +4425,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GVa
 		data1 = closure->data;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4386 "TumblrPublishing.c"
+#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 4392 "TumblrPublishing.c"
+#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 4398 "TumblrPublishing.c"
+#line 4423 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (PublishingTumblrTumblrPublisherAuthenticationPaneClass * klass) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	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"
@@ -4428,20 +4451,16 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (P
 #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"
-	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);
+	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_ = _ ("Enter the username and password associated with your Tumblr account.");
+	_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"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp1_;
+	publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp0_;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _ ("Username and/or password invalid. Please try again");
+	_tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_;
-#line 4427 "TumblrPublishing.c"
+	publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
+#line 4446 "TumblrPublishing.c"
 }
 
 
@@ -4449,14 +4468,14 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishi
 #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;
+	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;
+	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;
+	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 4442 "TumblrPublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled;
+#line 4461 "TumblrPublishing.c"
 }
 
 
@@ -4465,11 +4484,11 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_instance_init
 	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 4451 "TumblrPublishing.c"
+#line 4470 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject* obj) {
+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);
@@ -4485,7 +4504,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GOb
 	_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 4471 "TumblrPublishing.c"
+#line 4490 "TumblrPublishing.c"
 }
 
 
@@ -4510,7 +4529,7 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) {
 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 4496 "TumblrPublishing.c"
+#line 4515 "TumblrPublishing.c"
 }
 
 
@@ -4521,24 +4540,24 @@ static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry**
 	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 4507 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry* _tmp0_ = NULL;
+#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 4513 "TumblrPublishing.c"
+#line 4532 "TumblrPublishing.c"
 	}
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4517 "TumblrPublishing.c"
+#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 4524 "TumblrPublishing.c"
+#line 4543 "TumblrPublishing.c"
 }
 
 
@@ -4549,64 +4568,64 @@ static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry**
 	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 4535 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry* _tmp0_ = NULL;
+#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 4541 "TumblrPublishing.c"
+#line 4560 "TumblrPublishing.c"
 	}
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4545 "TumblrPublishing.c"
+#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 4552 "TumblrPublishing.c"
+#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 4559 "TumblrPublishing.c"
+#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 4566 "TumblrPublishing.c"
+#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 4573 "TumblrPublishing.c"
+#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_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingTumblrTumblrPublisher* _tmp3_ = NULL;
-	PublishingTumblrTumblrPublisher* _tmp4_ = NULL;
-	SpitPublishingPublisherMediaType _tmp5_ = 0;
-	PublishingTumblrSizeEntry** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	PublishingTumblrSizeEntry** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	PublishingTumblrBlogEntry** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	PublishingTumblrBlogEntry** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	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);
@@ -4674,45 +4693,44 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 	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 4660 "TumblrPublishing.c"
+#line 4679 "TumblrPublishing.c"
 	{
-		GtkBuilder* _tmp10_ = NULL;
-		GtkBuilder* _tmp11_ = NULL;
-		GtkBuilder* _tmp12_ = NULL;
-		GtkBuilder* _tmp13_ = NULL;
-		GObject* _tmp14_ = NULL;
-		GtkBox* _tmp15_ = NULL;
-		GtkBuilder* _tmp16_ = NULL;
-		GObject* _tmp17_ = NULL;
-		GtkLabel* _tmp18_ = NULL;
-		GtkBuilder* _tmp19_ = NULL;
-		GObject* _tmp20_ = NULL;
-		GtkButton* _tmp21_ = NULL;
-		GtkBuilder* _tmp22_ = NULL;
-		GObject* _tmp23_ = NULL;
-		GtkButton* _tmp24_ = NULL;
-		GtkBuilder* _tmp25_ = NULL;
-		GObject* _tmp26_ = NULL;
-		GtkComboBoxText* _tmp27_ = NULL;
-		GtkBuilder* _tmp28_ = NULL;
-		GObject* _tmp29_ = NULL;
-		GtkLabel* _tmp30_ = NULL;
-		GtkBuilder* _tmp31_ = NULL;
-		GObject* _tmp32_ = NULL;
-		GtkComboBoxText* _tmp33_ = NULL;
-		GtkBuilder* _tmp34_ = NULL;
-		GObject* _tmp35_ = NULL;
-		GtkLabel* _tmp36_ = NULL;
+		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_ = NULL;
-		const gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		GtkLabel* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
-		GtkComboBoxText* _tmp42_ = NULL;
-		SpitPublishingPublisherMediaType _tmp43_ = 0;
-		GtkButton* _tmp47_ = NULL;
-		GtkButton* _tmp48_ = 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"
@@ -4725,7 +4743,7 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 		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 4711 "TumblrPublishing.c"
+#line 4729 "TumblrPublishing.c"
 			goto __catch37_g_error;
 		}
 #line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4813,85 +4831,80 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 #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_ = _ ("You are logged into Tumblr as %s.\n\n");
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = self->priv->username;
+		_tmp37_ = self->priv->username;
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = g_strdup_printf (_tmp37_, _tmp38_);
+		_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 = _tmp39_;
+		upload_label_text = _tmp38_;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp40_ = self->priv->upload_info_label;
+		_tmp39_ = self->priv->upload_info_label;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp41_ = upload_label_text;
+		_tmp40_ = upload_label_text;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_label_set_label (_tmp40_, _tmp41_);
+		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"
-		_tmp42_ = self->priv->blog_combo;
+		_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 (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
+		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"
-		_tmp43_ = media_type;
+		_tmp42_ = media_type;
 #line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_tmp43_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4822 "TumblrPublishing.c"
-			GtkComboBoxText* _tmp44_ = NULL;
+		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"
-			_tmp44_ = self->priv->size_combo;
+			_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 (_tmp44_, 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 4830 "TumblrPublishing.c"
+			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* _tmp45_ = NULL;
-			GtkLabel* _tmp46_ = NULL;
+			GtkComboBoxText* _tmp44_;
+			GtkLabel* _tmp45_;
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp45_ = self->priv->size_combo;
+			_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 (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+			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"
-			_tmp46_ = self->priv->size_label;
+			_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 (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4842 "TumblrPublishing.c"
+			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"
-		_tmp47_ = self->priv->logout_button;
+		_tmp46_ = self->priv->logout_button;
 #line 750 "/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_logout_clicked_gtk_button_clicked, self, 0);
+		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"
-		_tmp48_ = self->priv->publish_button;
+		_tmp47_ = self->priv->publish_button;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp48_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+		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 4854 "TumblrPublishing.c"
+#line 4870 "TumblrPublishing.c"
 	}
 	goto __finally37;
 	__catch37_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp49_ = NULL;
-		GError* _tmp50_ = NULL;
-		const gchar* _tmp51_ = 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"
-		_tmp49_ = _ ("Could not load UI: %s");
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp50_ = e;
+		_tmp48_ = e;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp51_ = _tmp50_->message;
+		_tmp49_ = _tmp48_->message;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_tmp49_, _tmp51_);
+		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 4877 "TumblrPublishing.c"
+#line 4890 "TumblrPublishing.c"
 	}
 	__finally37:
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4902,18 +4915,18 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 		g_clear_error (&_inner_error_);
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return NULL;
-#line 4888 "TumblrPublishing.c"
+#line 4901 "TumblrPublishing.c"
 	}
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 4892 "TumblrPublishing.c"
+#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 4899 "TumblrPublishing.c"
+#line 4912 "TumblrPublishing.c"
 }
 
 
@@ -4921,8 +4934,8 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout
 #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_by_name (self, "logout");
-#line 4908 "TumblrPublishing.c"
+	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"
 }
 
 
@@ -4930,14 +4943,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publis
 #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_by_name (self, "publish");
-#line 4917 "TumblrPublishing.c"
+	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_ = NULL;
-	gint _tmp0__length1 = 0;
+	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"
@@ -4946,17 +4959,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 	_tmp0__length1 = self->priv->blogs_length1;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4932 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		GtkComboBoxText* _tmp6_ = NULL;
-		PublishingTumblrTumblrPublisher* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
+#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 4942 "TumblrPublishing.c"
+#line 4955 "TumblrPublishing.c"
 		{
 			PublishingTumblrBlogEntry** b_collection = NULL;
 			gint b_collection_length1 = 0;
@@ -4968,18 +4981,18 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 			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 4954 "TumblrPublishing.c"
-				PublishingTumblrBlogEntry* _tmp2_ = NULL;
+#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 4961 "TumblrPublishing.c"
+#line 4974 "TumblrPublishing.c"
 				{
-					GtkComboBoxText* _tmp3_ = NULL;
-					PublishingTumblrBlogEntry* _tmp4_ = NULL;
-					const gchar* _tmp5_ = NULL;
+					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"
@@ -4990,7 +5003,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 					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 4976 "TumblrPublishing.c"
+#line 4989 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -5002,15 +5015,15 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 		_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 4988 "TumblrPublishing.c"
+#line 5001 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	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"
@@ -5021,13 +5034,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_c
 	_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 5007 "TumblrPublishing.c"
+#line 5020 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrSizeEntry** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	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"
@@ -5036,17 +5049,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 	_tmp0__length1 = self->priv->sizes_length1;
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 5022 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		GtkComboBoxText* _tmp6_ = NULL;
-		PublishingTumblrTumblrPublisher* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
+#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 5032 "TumblrPublishing.c"
+#line 5045 "TumblrPublishing.c"
 		{
 			PublishingTumblrSizeEntry** e_collection = NULL;
 			gint e_collection_length1 = 0;
@@ -5058,18 +5071,18 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 			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 5044 "TumblrPublishing.c"
-				PublishingTumblrSizeEntry* _tmp2_ = NULL;
+#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 5051 "TumblrPublishing.c"
+#line 5064 "TumblrPublishing.c"
 				{
-					GtkComboBoxText* _tmp3_ = NULL;
-					PublishingTumblrSizeEntry* _tmp4_ = NULL;
-					const gchar* _tmp5_ = NULL;
+					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"
@@ -5080,7 +5093,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 					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 5066 "TumblrPublishing.c"
+#line 5079 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -5092,15 +5105,15 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 		_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 5078 "TumblrPublishing.c"
+#line 5091 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	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"
@@ -5111,7 +5124,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_c
 	_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 5097 "TumblrPublishing.c"
+#line 5110 "TumblrPublishing.c"
 }
 
 
@@ -5119,8 +5132,8 @@ void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (
 #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_by_name (self, "publish");
-#line 5106 "TumblrPublishing.c"
+	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"
 }
 
 
@@ -5128,16 +5141,16 @@ void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (P
 #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_by_name (self, "logout");
-#line 5115 "TumblrPublishing.c"
+	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_ = NULL;
-	GtkWidget* _tmp1_ = 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"
@@ -5148,7 +5161,7 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_rea
 	result = _tmp1_;
 #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5134 "TumblrPublishing.c"
+#line 5147 "TumblrPublishing.c"
 }
 
 
@@ -5161,21 +5174,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5147 "TumblrPublishing.c"
+#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 5154 "TumblrPublishing.c"
+#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 5161 "TumblrPublishing.c"
+#line 5174 "TumblrPublishing.c"
 }
 
 
@@ -5187,14 +5200,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
 	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 5173 "TumblrPublishing.c"
+#line 5186 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
+	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"
@@ -5205,7 +5218,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
 	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 5191 "TumblrPublishing.c"
+#line 5204 "TumblrPublishing.c"
 }
 
 
@@ -5217,10 +5230,10 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_ini
 #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"
-	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);
+	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"
-	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 5206 "TumblrPublishing.c"
+	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"
 }
 
 
@@ -5228,19 +5241,19 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publ
 #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;
+	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;
+	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;
+	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 5221 "TumblrPublishing.c"
+	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_ = NULL;
+	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"
@@ -5277,11 +5290,11 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_
 	self->priv->username = _tmp0_;
 #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 5263 "TumblrPublishing.c"
+#line 5276 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject* obj) {
+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);
@@ -5313,7 +5326,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize
 	_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 5299 "TumblrPublishing.c"
+#line 5312 "TumblrPublishing.c"
 }
 
 
@@ -5336,8 +5349,8 @@ GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void)
 
 PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingTumblrTumblrPublisherTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+	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"
@@ -5348,32 +5361,32 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 	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 5334 "TumblrPublishing.c"
+#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 5341 "TumblrPublishing.c"
+#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_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
-	PublishingTumblrTumblrPublisherSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	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"
@@ -5424,10 +5437,10 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 	_g_free0 (_tmp11_);
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp12_) {
-#line 5410 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+#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"
@@ -5438,25 +5451,25 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 		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 5424 "TumblrPublishing.c"
+#line 5437 "TumblrPublishing.c"
 	}
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5428 "TumblrPublishing.c"
+#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 5435 "TumblrPublishing.c"
+#line 5448 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingTumblrTumblrPublisherTransaction * self;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL;
+	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);
@@ -5478,7 +5491,7 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish
 			g_propagate_error (error, _inner_error_);
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 5464 "TumblrPublishing.c"
+#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);
@@ -5486,7 +5499,7 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish
 			g_clear_error (&_inner_error_);
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 5472 "TumblrPublishing.c"
+#line 5485 "TumblrPublishing.c"
 		}
 	}
 }
@@ -5496,8 +5509,8 @@ static void publishing_tumblr_tumblr_publisher_transaction_class_init (Publishin
 #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 5483 "TumblrPublishing.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute;
+#line 5496 "TumblrPublishing.c"
 }
 
 
@@ -5519,11 +5532,11 @@ GType publishing_tumblr_tumblr_publisher_transaction_get_type (void) {
 
 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_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = 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"
@@ -5552,21 +5565,21 @@ PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tu
 	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 5538 "TumblrPublishing.c"
+#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 5545 "TumblrPublishing.c"
+#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 5552 "TumblrPublishing.c"
+#line 5565 "TumblrPublishing.c"
 }
 
 
@@ -5588,7 +5601,7 @@ GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type
 
 PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session) {
 	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = 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"
@@ -5597,21 +5610,21 @@ PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumbl
 	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 5583 "TumblrPublishing.c"
+#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 5590 "TumblrPublishing.c"
+#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 5597 "TumblrPublishing.c"
+#line 5610 "TumblrPublishing.c"
 }
 
 
@@ -5634,19 +5647,19 @@ GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (v
 static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1) {
 	gchar* result = NULL;
 	GString* s = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	gchar* bytes = NULL;
-	gchar* _tmp1_ = NULL;
-	gint bytes_length1 = 0;
-	gint _bytes_size_ = 0;
-	gchar* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gchar _tmp3_ = '\0';
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GString* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = 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"
@@ -5673,7 +5686,7 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 	_tmp4_ = data;
 #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4__length1 = data_length1;
-#line 5659 "TumblrPublishing.c"
+#line 5672 "TumblrPublishing.c"
 	{
 		guint8* byte_collection = NULL;
 		gint byte_collection_length1 = 0;
@@ -5685,34 +5698,34 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 		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 5671 "TumblrPublishing.c"
+#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 5675 "TumblrPublishing.c"
+#line 5688 "TumblrPublishing.c"
 			{
-				guint8 _tmp5_ = 0U;
+				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 5682 "TumblrPublishing.c"
-					GString* _tmp6_ = NULL;
+#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 5688 "TumblrPublishing.c"
+#line 5701 "TumblrPublishing.c"
 				} else {
-					gchar* _tmp7_ = NULL;
-					gint _tmp7__length1 = 0;
-					guint8 _tmp8_ = 0U;
-					gchar _tmp9_ = '\0';
-					GString* _tmp10_ = NULL;
-					gchar* _tmp11_ = NULL;
-					gint _tmp11__length1 = 0;
-					gchar* _tmp12_ = NULL;
-					gchar* _tmp13_ = NULL;
+					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"
@@ -5737,7 +5750,7 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 					g_string_append (_tmp10_, _tmp13_);
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (_tmp13_);
-#line 5723 "TumblrPublishing.c"
+#line 5736 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -5756,26 +5769,26 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 	_g_string_free0 (s);
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5742 "TumblrPublishing.c"
+#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 5749 "TumblrPublishing.c"
+#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_ = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp6_ = 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"
@@ -5808,40 +5821,40 @@ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publi
 	self->priv->session = _tmp6_;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5794 "TumblrPublishing.c"
+#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 5801 "TumblrPublishing.c"
+#line 5814 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add22 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+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 5812 "TumblrPublishing.c"
+#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 5818 "TumblrPublishing.c"
+#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_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportArgument* _tmp3_ = NULL;
+	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"
@@ -5860,14 +5873,14 @@ void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_hea
 	_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 5846 "TumblrPublishing.c"
+#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 5853 "TumblrPublishing.c"
+#line 5866 "TumblrPublishing.c"
 }
 
 
@@ -5878,28 +5891,28 @@ static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportAr
 	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 5864 "TumblrPublishing.c"
-		PublishingRESTSupportArgument* _tmp0_ = NULL;
+#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 5870 "TumblrPublishing.c"
+#line 5883 "TumblrPublishing.c"
 	}
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5874 "TumblrPublishing.c"
+#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_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingRESTSupportArgument** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingRESTSupportArgument** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	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"
@@ -5918,74 +5931,74 @@ PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transa
 	if (result_length1) {
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 5904 "TumblrPublishing.c"
+#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 5910 "TumblrPublishing.c"
+#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_ = 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 5924 "TumblrPublishing.c"
+#line 5937 "TumblrPublishing.c"
 	{
 		gint i = 0;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 5929 "TumblrPublishing.c"
+#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 5936 "TumblrPublishing.c"
-				gint _tmp3_ = 0;
-				PublishingRESTSupportArgument** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				const gchar* _tmp5_ = NULL;
-				PublishingRESTSupportArgument** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				PublishingRESTSupportArgument* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
-				PublishingRESTSupportArgument** _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				gint _tmp15_ = 0;
-				PublishingRESTSupportArgument* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				PublishingRESTSupportArgument** _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
+#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 5965 "TumblrPublishing.c"
-					gint _tmp2_ = 0;
+#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 5971 "TumblrPublishing.c"
+#line 5984 "TumblrPublishing.c"
 				}
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp1_ = FALSE;
@@ -5999,7 +6012,7 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 5985 "TumblrPublishing.c"
+#line 5998 "TumblrPublishing.c"
 				}
 #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp5_ = _result_;
@@ -6065,9 +6078,9 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 				_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 6051 "TumblrPublishing.c"
-					const gchar* _tmp25_ = NULL;
-					gchar* _tmp26_ = NULL;
+#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"
@@ -6076,7 +6089,7 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 					_g_free0 (_result_);
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_result_ = _tmp26_;
-#line 6062 "TumblrPublishing.c"
+#line 6075 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -6085,515 +6098,515 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 	result = _result_;
 #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 6071 "TumblrPublishing.c"
+#line 6084 "TumblrPublishing.c"
 }
 
 
 static guint8* string_get_data (const gchar* self, int* result_length1) {
 	guint8* result;
 	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	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 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 6115 "TumblrPublishing.c"
+#line 6128 "TumblrPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6121 "TumblrPublishing.c"
+#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_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
-#line 6138 "TumblrPublishing.c"
+#line 6151 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 6148 "TumblrPublishing.c"
+#line 6161 "TumblrPublishing.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 6158 "TumblrPublishing.c"
+#line 6171 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 6164 "TumblrPublishing.c"
+#line 6177 "TumblrPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 6175 "TumblrPublishing.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 6187 "TumblrPublishing.c"
+#line 6200 "TumblrPublishing.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 6191 "TumblrPublishing.c"
+#line 6204 "TumblrPublishing.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 6195 "TumblrPublishing.c"
+#line 6208 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 6199 "TumblrPublishing.c"
+#line 6212 "TumblrPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		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 6222 "TumblrPublishing.c"
+#line 6235 "TumblrPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 6231 "TumblrPublishing.c"
+#line 6244 "TumblrPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				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 6244 "TumblrPublishing.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6257 "TumblrPublishing.c"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 6250 "TumblrPublishing.c"
+#line 6263 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 6260 "TumblrPublishing.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 6272 "TumblrPublishing.c"
+#line 6285 "TumblrPublishing.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 6276 "TumblrPublishing.c"
+#line 6289 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 6282 "TumblrPublishing.c"
+#line 6295 "TumblrPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 6293 "TumblrPublishing.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 6308 "TumblrPublishing.c"
+#line 6321 "TumblrPublishing.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 6312 "TumblrPublishing.c"
+#line 6325 "TumblrPublishing.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 6316 "TumblrPublishing.c"
+#line 6329 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 6322 "TumblrPublishing.c"
+#line 6335 "TumblrPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 6334 "TumblrPublishing.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 6355 "TumblrPublishing.c"
+#line 6368 "TumblrPublishing.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 6359 "TumblrPublishing.c"
+#line 6372 "TumblrPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 6365 "TumblrPublishing.c"
+#line 6378 "TumblrPublishing.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 6372 "TumblrPublishing.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6385 "TumblrPublishing.c"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
-#line 6380 "TumblrPublishing.c"
+#line 6393 "TumblrPublishing.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 6418 "TumblrPublishing.c"
+#line 6431 "TumblrPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 6427 "TumblrPublishing.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+#line 6440 "TumblrPublishing.c"
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				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 6443 "TumblrPublishing.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6456 "TumblrPublishing.c"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 6449 "TumblrPublishing.c"
+#line 6462 "TumblrPublishing.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 6463 "TumblrPublishing.c"
+#line 6476 "TumblrPublishing.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 6483 "TumblrPublishing.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 6498 "TumblrPublishing.c"
+#line 6511 "TumblrPublishing.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 6502 "TumblrPublishing.c"
+#line 6515 "TumblrPublishing.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 6510 "TumblrPublishing.c"
+#line 6523 "TumblrPublishing.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 6521 "TumblrPublishing.c"
+#line 6534 "TumblrPublishing.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 6530 "TumblrPublishing.c"
+#line 6543 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingTumblrTumblrPublisherUploadTransaction * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	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* _tmp34_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp33_;
 	gchar* authorization_header = NULL;
-	gchar* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
+	gchar* _tmp34_;
+	const gchar* _tmp35_;
+	const gchar* _tmp36_;
 	PublishingRESTSupportArgument** request_arguments = NULL;
-	gint _tmp38_ = 0;
-	PublishingRESTSupportArgument** _tmp39_ = NULL;
-	gint request_arguments_length1 = 0;
-	gint _request_arguments_size_ = 0;
-	PublishingRESTSupportArgument** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
+	gint _tmp37_;
+	PublishingRESTSupportArgument** _tmp38_;
+	gint request_arguments_length1;
+	gint _request_arguments_size_;
+	PublishingRESTSupportArgument** _tmp39_;
+	gint _tmp39__length1;
 	gchar* request_data = NULL;
-	gchar* _tmp41_ = NULL;
+	gchar* _tmp40_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	SoupMessage* _tmp66_ = NULL;
-	SoupMessage* _tmp67_ = NULL;
-	SoupMessage* _tmp68_ = NULL;
-	const gchar* _tmp69_ = NULL;
-	guint8* _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	guint8* _tmp71_ = NULL;
-	gint _tmp71__length1 = 0;
+	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* _tmp72_ = NULL;
-	GeeMapIterator* _tmp73_ = NULL;
+	GeeHashMap* _tmp71_;
+	GeeMapIterator* _tmp72_;
 	gboolean cont = FALSE;
-	GeeMapIterator* _tmp74_ = NULL;
-	gboolean _tmp75_ = FALSE;
-	SoupMessage* _tmp87_ = NULL;
+	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);
@@ -6633,37 +6646,37 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 	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 6619 "TumblrPublishing.c"
+#line 6632 "TumblrPublishing.c"
 	{
-		SpitPublishingPublishable* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+		SpitPublishingPublishable* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 		gchar* _tmp14_ = NULL;
 		gsize _tmp15_ = 0UL;
 		gchar* reqdata = NULL;
-		const gchar* _tmp16_ = NULL;
-		guint8* _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
-		guint8* _tmp18_ = NULL;
-		gint _tmp18__length1 = 0;
-		gsize _tmp19_ = 0UL;
-		gchar* _tmp20_ = NULL;
-		const gchar* _tmp21_ = 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_ = NULL;
-		gint _tmp23_ = 0;
-		gchar** _tmp24_ = NULL;
-		gint keywords_length1 = 0;
-		gint _keywords_size_ = 0;
+		SpitPublishingPublishable* _tmp22_;
+		gint _tmp23_;
+		gchar** _tmp24_;
+		gint keywords_length1;
+		gint _keywords_size_;
 		gchar* tags = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar** _tmp26_ = NULL;
-		gint _tmp26__length1 = 0;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = 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"
@@ -6690,7 +6703,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		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 6676 "TumblrPublishing.c"
+#line 6689 "TumblrPublishing.c"
 				goto __catch38_g_file_error;
 			}
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -6701,7 +6714,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			g_clear_error (&_inner_error_);
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6687 "TumblrPublishing.c"
+#line 6700 "TumblrPublishing.c"
 		}
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp16_ = payload;
@@ -6743,10 +6756,10 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		_tmp26__length1 = keywords_length1;
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (_tmp26_ != NULL) {
-#line 6729 "TumblrPublishing.c"
-			gchar** _tmp27_ = NULL;
-			gint _tmp27__length1 = 0;
-			gchar* _tmp28_ = 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"
@@ -6757,7 +6770,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			_g_free0 (tags);
 #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			tags = _tmp28_;
-#line 6743 "TumblrPublishing.c"
+#line 6756 "TumblrPublishing.c"
 		}
 #line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp29_ = tags;
@@ -6775,27 +6788,24 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		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 6761 "TumblrPublishing.c"
+#line 6774 "TumblrPublishing.c"
 	}
 	goto __finally38;
 	__catch38_g_file_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp32_ = NULL;
-		GError* _tmp33_ = 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_ = _ ("A temporary file needed for publishing is unavailable");
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp32_);
+		_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_ = _tmp33_;
+		_inner_error_ = _tmp32_;
 #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (e);
-#line 6781 "TumblrPublishing.c"
+#line 6791 "TumblrPublishing.c"
 		goto __finally38;
 	}
 	__finally38:
@@ -6809,7 +6819,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			_g_free0 (payload);
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6795 "TumblrPublishing.c"
+#line 6805 "TumblrPublishing.c"
 		} else {
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (payload);
@@ -6819,259 +6829,259 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			g_clear_error (&_inner_error_);
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6805 "TumblrPublishing.c"
+#line 6815 "TumblrPublishing.c"
 		}
 	}
 #line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = self->priv->session;
+	_tmp33_ = self->priv->session;
 #line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	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"
-	_tmp35_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self);
+	_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 = _tmp35_;
+	authorization_header = _tmp34_;
 #line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp36_ = authorization_header;
+	_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'", _tmp36_);
+" header string = '%s'", _tmp35_);
 #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp37_ = authorization_header;
+	_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", _tmp37_);
+	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"
-	_tmp39_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp38_);
+	_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 = _tmp39_;
+	request_arguments = _tmp38_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments_length1 = _tmp38_;
+	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"
-	_tmp40_ = request_arguments;
+	_tmp39_ = request_arguments;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp40__length1 = request_arguments_length1;
+	_tmp39__length1 = request_arguments_length1;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_assert (_tmp40__length1 > 0, "request_arguments.length > 0");
+	_vala_assert (_tmp39__length1 > 0, "request_arguments.length > 0");
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp41_ = g_strdup ("");
+	_tmp40_ = g_strdup ("");
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_data = _tmp41_;
-#line 6842 "TumblrPublishing.c"
+	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 6847 "TumblrPublishing.c"
+#line 6857 "TumblrPublishing.c"
 		{
-			gboolean _tmp42_ = FALSE;
+			gboolean _tmp41_ = FALSE;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp42_ = TRUE;
+			_tmp41_ = TRUE;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			while (TRUE) {
-#line 6854 "TumblrPublishing.c"
-				gint _tmp44_ = 0;
-				PublishingRESTSupportArgument** _tmp45_ = NULL;
-				gint _tmp45__length1 = 0;
-				const gchar* _tmp46_ = NULL;
-				PublishingRESTSupportArgument** _tmp47_ = NULL;
-				gint _tmp47__length1 = 0;
-				gint _tmp48_ = 0;
-				PublishingRESTSupportArgument* _tmp49_ = NULL;
-				const gchar* _tmp50_ = NULL;
-				gchar* _tmp51_ = NULL;
-				gchar* _tmp52_ = NULL;
-				PublishingRESTSupportArgument** _tmp53_ = NULL;
-				gint _tmp53__length1 = 0;
-				gint _tmp54_ = 0;
-				PublishingRESTSupportArgument* _tmp55_ = NULL;
-				const gchar* _tmp56_ = NULL;
-				gchar* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				gchar* _tmp59_ = NULL;
-				gint _tmp60_ = 0;
-				PublishingRESTSupportArgument** _tmp61_ = NULL;
-				gint _tmp61__length1 = 0;
+#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 (!_tmp42_) {
-#line 6879 "TumblrPublishing.c"
-					gint _tmp43_ = 0;
+				if (!_tmp41_) {
+#line 6889 "TumblrPublishing.c"
+					gint _tmp42_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp43_ = i;
+					_tmp42_ = i;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp43_ + 1;
-#line 6885 "TumblrPublishing.c"
+					i = _tmp42_ + 1;
+#line 6895 "TumblrPublishing.c"
 				}
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp42_ = FALSE;
+				_tmp41_ = FALSE;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44_ = i;
+				_tmp43_ = i;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45_ = request_arguments;
+				_tmp44_ = request_arguments;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45__length1 = request_arguments_length1;
+				_tmp44__length1 = request_arguments_length1;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp44_ < _tmp45__length1)) {
+				if (!(_tmp43_ < _tmp44__length1)) {
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 6899 "TumblrPublishing.c"
+#line 6909 "TumblrPublishing.c"
 				}
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46_ = request_data;
+				_tmp45_ = request_data;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47_ = request_arguments;
+				_tmp46_ = request_arguments;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47__length1 = request_arguments_length1;
+				_tmp46__length1 = request_arguments_length1;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48_ = i;
+				_tmp47_ = i;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp49_ = _tmp47_[_tmp48_];
+				_tmp48_ = _tmp46_[_tmp47_];
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp50_ = _tmp49_->key;
+				_tmp49_ = _tmp48_->key;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp51_ = g_strconcat (_tmp50_, "=", NULL);
+				_tmp50_ = g_strconcat (_tmp49_, "=", NULL);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp52_ = _tmp51_;
+				_tmp51_ = _tmp50_;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp53_ = request_arguments;
+				_tmp52_ = request_arguments;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp53__length1 = request_arguments_length1;
+				_tmp52__length1 = request_arguments_length1;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp54_ = i;
+				_tmp53_ = i;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp55_ = _tmp53_[_tmp54_];
+				_tmp54_ = _tmp52_[_tmp53_];
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp56_ = _tmp55_->value;
+				_tmp55_ = _tmp54_->value;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp57_ = g_strconcat (_tmp52_, _tmp56_, NULL);
+				_tmp56_ = g_strconcat (_tmp51_, _tmp55_, NULL);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp58_ = _tmp57_;
+				_tmp57_ = _tmp56_;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp59_ = g_strconcat (_tmp46_, _tmp58_, NULL);
+				_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 = _tmp59_;
+				request_data = _tmp58_;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp58_);
+				_g_free0 (_tmp57_);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp52_);
+				_g_free0 (_tmp51_);
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp60_ = i;
+				_tmp59_ = i;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp61_ = request_arguments;
+				_tmp60_ = request_arguments;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp61__length1 = request_arguments_length1;
+				_tmp60__length1 = request_arguments_length1;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp60_ < (_tmp61__length1 - 1)) {
-#line 6949 "TumblrPublishing.c"
-					const gchar* _tmp62_ = NULL;
-					gchar* _tmp63_ = NULL;
+				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"
-					_tmp62_ = request_data;
+					_tmp61_ = request_data;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp63_ = g_strconcat (_tmp62_, "&", NULL);
+					_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 = _tmp63_;
-#line 6960 "TumblrPublishing.c"
+					request_data = _tmp62_;
+#line 6970 "TumblrPublishing.c"
 				}
 			}
 		}
 	}
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp64_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_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"
-	_tmp65_ = _tmp64_;
+	_tmp64_ = _tmp63_;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp66_ = soup_message_new ("POST", _tmp65_);
+	_tmp65_ = soup_message_new ("POST", _tmp64_);
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp67_ = _tmp66_;
+	_tmp66_ = _tmp65_;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp65_);
+	_g_free0 (_tmp64_);
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	outbound_message = _tmp67_;
+	outbound_message = _tmp66_;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp68_ = outbound_message;
+	_tmp67_ = outbound_message;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp69_ = request_data;
+	_tmp68_ = request_data;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70_ = string_get_data (_tmp69_, &_tmp70__length1);
+	_tmp69_ = string_get_data (_tmp68_, &_tmp69__length1);
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71_ = _tmp70_;
+	_tmp70_ = _tmp69_;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71__length1 = _tmp70__length1;
+	_tmp70__length1 = _tmp69__length1;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	soup_message_set_request (_tmp68_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp71_, (gsize) _tmp71__length1);
+	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"
-	_tmp72_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
+	_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"
-	_tmp73_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+	_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 = _tmp73_;
+	i = _tmp72_;
 #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp74_ = i;
+	_tmp73_ = i;
 #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp75_ = gee_map_iterator_next (_tmp74_);
+	_tmp74_ = gee_map_iterator_next (_tmp73_);
 #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	cont = _tmp75_;
+	cont = _tmp74_;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	while (TRUE) {
-#line 7003 "TumblrPublishing.c"
-		gboolean _tmp76_ = FALSE;
-		SoupMessage* _tmp77_ = NULL;
-		SoupMessageHeaders* _tmp78_ = NULL;
-		GeeMapIterator* _tmp79_ = NULL;
-		gpointer _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		GeeMapIterator* _tmp82_ = NULL;
-		gpointer _tmp83_ = NULL;
-		gchar* _tmp84_ = NULL;
-		GeeMapIterator* _tmp85_ = NULL;
-		gboolean _tmp86_ = FALSE;
+#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"
-		_tmp76_ = cont;
+		_tmp75_ = cont;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (!_tmp76_) {
+		if (!_tmp75_) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			break;
-#line 7021 "TumblrPublishing.c"
+#line 7031 "TumblrPublishing.c"
 		}
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp77_ = outbound_message;
+		_tmp76_ = outbound_message;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp78_ = _tmp77_->request_headers;
+		_tmp77_ = _tmp76_->request_headers;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp79_ = i;
+		_tmp78_ = i;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp80_ = gee_map_iterator_get_key (_tmp79_);
+		_tmp79_ = gee_map_iterator_get_key (_tmp78_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp81_ = (gchar*) _tmp80_;
+		_tmp80_ = (gchar*) _tmp79_;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp82_ = i;
+		_tmp81_ = i;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp83_ = gee_map_iterator_get_value (_tmp82_);
+		_tmp82_ = gee_map_iterator_get_value (_tmp81_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp84_ = (gchar*) _tmp83_;
+		_tmp83_ = (gchar*) _tmp82_;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		soup_message_headers_append (_tmp78_, _tmp81_, _tmp84_);
+		soup_message_headers_append (_tmp77_, _tmp80_, _tmp83_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp84_);
+		_g_free0 (_tmp83_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp81_);
+		_g_free0 (_tmp80_);
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp85_ = i;
+		_tmp84_ = i;
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp86_ = gee_map_iterator_next (_tmp85_);
+		_tmp85_ = gee_map_iterator_next (_tmp84_);
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		cont = _tmp86_;
-#line 7051 "TumblrPublishing.c"
+		cont = _tmp85_;
+#line 7061 "TumblrPublishing.c"
 	}
 #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp87_ = outbound_message;
+	_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), _tmp87_);
+	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"
@@ -7096,7 +7106,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			_g_free0 (payload);
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 7081 "TumblrPublishing.c"
+#line 7091 "TumblrPublishing.c"
 		} else {
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (i);
@@ -7116,7 +7126,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			g_clear_error (&_inner_error_);
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 7101 "TumblrPublishing.c"
+#line 7111 "TumblrPublishing.c"
 		}
 	}
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7131,7 +7141,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 	_g_free0 (authorization_header);
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (payload);
-#line 7116 "TumblrPublishing.c"
+#line 7126 "TumblrPublishing.c"
 }
 
 
@@ -7143,19 +7153,19 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (Pu
 #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 7129 "TumblrPublishing.c"
+	((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 7136 "TumblrPublishing.c"
+#line 7146 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+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);
@@ -7165,7 +7175,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (Publ
 	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 7150 "TumblrPublishing.c"
+#line 7160 "TumblrPublishing.c"
 }
 
 
@@ -7183,11 +7193,11 @@ GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) {
 
 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_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = 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"
@@ -7210,27 +7220,27 @@ PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uplo
 	self->priv->blog_url = _tmp3_;
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 7195 "TumblrPublishing.c"
+#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 7202 "TumblrPublishing.c"
+#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_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = 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"
@@ -7259,7 +7269,7 @@ static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uplo
 	result = _tmp6_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7244 "TumblrPublishing.c"
+#line 7254 "TumblrPublishing.c"
 }
 
 
@@ -7271,24 +7281,24 @@ static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTu
 #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 7257 "TumblrPublishing.c"
+	((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_ = NULL;
+	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 7269 "TumblrPublishing.c"
+#line 7279 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+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);
@@ -7296,7 +7306,7 @@ static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingREST
 	_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 7281 "TumblrPublishing.c"
+#line 7291 "TumblrPublishing.c"
 }
 
 
@@ -7318,14 +7328,14 @@ PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_sessi
 	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 7303 "TumblrPublishing.c"
+#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 7310 "TumblrPublishing.c"
+#line 7320 "TumblrPublishing.c"
 }
 
 
@@ -7333,38 +7343,38 @@ static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated
 	PublishingTumblrTumblrPublisherSession * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	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 7325 "TumblrPublishing.c"
-		const gchar* _tmp2_ = 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 7331 "TumblrPublishing.c"
+#line 7341 "TumblrPublishing.c"
 	} else {
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 7335 "TumblrPublishing.c"
+#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 7341 "TumblrPublishing.c"
+#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_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	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"
@@ -7389,7 +7399,7 @@ void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_cre
 	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 7374 "TumblrPublishing.c"
+#line 7384 "TumblrPublishing.c"
 }
 
 
@@ -7404,92 +7414,92 @@ void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblr
 	_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 7389 "TumblrPublishing.c"
+#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 7396 "TumblrPublishing.c"
+#line 7406 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add23 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+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 7407 "TumblrPublishing.c"
+#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 7413 "TumblrPublishing.c"
+#line 7423 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumblrTumblrPublisherSession* self, PublishingRESTSupportTransaction* txn) {
 	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	gchar* signing_key = NULL;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp6_;
 	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	PublishingRESTSupportArgument** _tmp13_ = NULL;
-	gint base_string_arguments_length1 = 0;
-	gint _base_string_arguments_size_ = 0;
+	PublishingRESTSupportTransaction* _tmp11_;
+	gint _tmp12_;
+	PublishingRESTSupportArgument** _tmp13_;
+	gint base_string_arguments_length1;
+	gint _base_string_arguments_size_;
 	PublishingTumblrTumblrPublisherUploadTransaction* upload_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp14_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_ = NULL;
+	PublishingRESTSupportTransaction* _tmp14_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_;
 	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	gint _tmp26_ = 0;
-	PublishingRESTSupportArgument** _tmp27_ = NULL;
-	gint sorted_args_length1 = 0;
-	gint _sorted_args_size_ = 0;
+	PublishingRESTSupportArgument** _tmp25_;
+	gint _tmp25__length1;
+	gint _tmp26_;
+	PublishingRESTSupportArgument** _tmp27_;
+	gint sorted_args_length1;
+	gint _sorted_args_size_;
 	gchar* arguments_string = NULL;
-	gchar* _tmp28_ = NULL;
+	gchar* _tmp28_;
 	gchar* signature_base_string = NULL;
-	const gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	PublishingRESTSupportTransaction* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	const gchar* _tmp68_ = NULL;
-	const gchar* _tmp69_ = 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_ = NULL;
-	const gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	const gchar* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	const gchar* _tmp76_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_ = 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"
@@ -7520,10 +7530,10 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp6_ = self->priv->access_phase_token_secret;
 #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp6_ != NULL) {
-#line 7505 "TumblrPublishing.c"
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = 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");
@@ -7539,9 +7549,9 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 		signing_key = _tmp9_;
 #line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 7523 "TumblrPublishing.c"
+#line 7533 "TumblrPublishing.c"
 	} else {
-		gchar* _tmp10_ = NULL;
+		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"
@@ -7550,7 +7560,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 		_g_free0 (signing_key);
 #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		signing_key = _tmp10_;
-#line 7534 "TumblrPublishing.c"
+#line 7544 "TumblrPublishing.c"
 	}
 #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp11_ = txn;
@@ -7572,15 +7582,15 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp16_ = upload_txn;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp16_ != NULL) {
-#line 7556 "TumblrPublishing.c"
+#line 7566 "TumblrPublishing.c"
 		PublishingRESTSupportArgument** auth_header_args = NULL;
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		PublishingRESTSupportArgument** _tmp19_ = NULL;
-		gint auth_header_args_length1 = 0;
-		gint _auth_header_args_size_ = 0;
-		PublishingRESTSupportArgument** _tmp20_ = NULL;
-		gint _tmp20__length1 = 0;
+		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");
@@ -7598,7 +7608,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 		_tmp20_ = auth_header_args;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp20__length1 = auth_header_args_length1;
-#line 7581 "TumblrPublishing.c"
+#line 7591 "TumblrPublishing.c"
 		{
 			PublishingRESTSupportArgument** arg_collection = NULL;
 			gint arg_collection_length1 = 0;
@@ -7610,19 +7620,19 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 			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 7593 "TumblrPublishing.c"
-				PublishingRESTSupportArgument* _tmp21_ = NULL;
+#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 7600 "TumblrPublishing.c"
+#line 7610 "TumblrPublishing.c"
 				{
-					PublishingRESTSupportArgument** _tmp22_ = NULL;
-					gint _tmp22__length1 = 0;
-					PublishingRESTSupportArgument* _tmp23_ = NULL;
-					PublishingRESTSupportArgument* _tmp24_ = NULL;
+					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"
@@ -7635,13 +7645,13 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 					_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 7618 "TumblrPublishing.c"
+#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 7624 "TumblrPublishing.c"
+#line 7634 "TumblrPublishing.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp25_ = base_string_arguments;
@@ -7659,50 +7669,50 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp28_ = g_strdup ("");
 #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	arguments_string = _tmp28_;
-#line 7642 "TumblrPublishing.c"
+#line 7652 "TumblrPublishing.c"
 	{
 		gint i = 0;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 7647 "TumblrPublishing.c"
+#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 7654 "TumblrPublishing.c"
-				gint _tmp31_ = 0;
-				PublishingRESTSupportArgument** _tmp32_ = NULL;
-				gint _tmp32__length1 = 0;
-				const gchar* _tmp33_ = NULL;
-				PublishingRESTSupportArgument** _tmp34_ = NULL;
-				gint _tmp34__length1 = 0;
-				gint _tmp35_ = 0;
-				PublishingRESTSupportArgument* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
-				gchar* _tmp39_ = NULL;
-				PublishingRESTSupportArgument** _tmp40_ = NULL;
-				gint _tmp40__length1 = 0;
-				gint _tmp41_ = 0;
-				PublishingRESTSupportArgument* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				gchar* _tmp46_ = NULL;
-				gint _tmp47_ = 0;
-				PublishingRESTSupportArgument** _tmp48_ = NULL;
-				gint _tmp48__length1 = 0;
+#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 7679 "TumblrPublishing.c"
-					gint _tmp30_ = 0;
+#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 7685 "TumblrPublishing.c"
+#line 7695 "TumblrPublishing.c"
 				}
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp29_ = FALSE;
@@ -7716,7 +7726,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 				if (!(_tmp31_ < _tmp32__length1)) {
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 7699 "TumblrPublishing.c"
+#line 7709 "TumblrPublishing.c"
 				}
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp33_ = arguments_string;
@@ -7766,9 +7776,9 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 				_tmp48__length1 = sorted_args_length1;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp47_ < (_tmp48__length1 - 1)) {
-#line 7749 "TumblrPublishing.c"
-					const gchar* _tmp49_ = NULL;
-					gchar* _tmp50_ = NULL;
+#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"
@@ -7777,7 +7787,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 					_g_free0 (arguments_string);
 #line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					arguments_string = _tmp50_;
-#line 7760 "TumblrPublishing.c"
+#line 7770 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -7866,26 +7876,26 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp77_ = upload_txn;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp77_ != NULL) {
-#line 7849 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_ = NULL;
-		const gchar* _tmp79_ = 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 7858 "TumblrPublishing.c"
+#line 7868 "TumblrPublishing.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp80_ = NULL;
-		const gchar* _tmp81_ = NULL;
+		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 7868 "TumblrPublishing.c"
+#line 7878 "TumblrPublishing.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (signature);
@@ -7903,15 +7913,15 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_g_free0 (signing_key);
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (http_method);
-#line 7886 "TumblrPublishing.c"
+#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_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	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"
@@ -7936,14 +7946,14 @@ void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (Pu
 	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 7919 "TumblrPublishing.c"
+#line 7929 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = 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"
@@ -7954,14 +7964,14 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (Publis
 	result = _tmp1_;
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7937 "TumblrPublishing.c"
+#line 7947 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = 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"
@@ -7972,25 +7982,25 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret
 	result = _tmp1_;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7955 "TumblrPublishing.c"
+#line 7965 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
 	GTimeVal currtime = {0};
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GTimeVal _tmp4_ = {0};
-	glong _tmp5_ = 0L;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GTimeVal _tmp4_;
+	glong _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 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"
@@ -8031,50 +8041,50 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTum
 	result = _tmp11_;
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 8014 "TumblrPublishing.c"
+#line 8024 "TumblrPublishing.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 8037 "TumblrPublishing.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8047 "TumblrPublishing.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8045 "TumblrPublishing.c"
+#line 8055 "TumblrPublishing.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8057 "TumblrPublishing.c"
+#line 8067 "TumblrPublishing.c"
 	}
 }
 
@@ -8083,133 +8093,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 8081 "TumblrPublishing.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8091 "TumblrPublishing.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8087 "TumblrPublishing.c"
+#line 8097 "TumblrPublishing.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 8091 "TumblrPublishing.c"
+#line 8101 "TumblrPublishing.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8095 "TumblrPublishing.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 8107 "TumblrPublishing.c"
+#line 8117 "TumblrPublishing.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 8117 "TumblrPublishing.c"
+#line 8127 "TumblrPublishing.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 8123 "TumblrPublishing.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8137 "TumblrPublishing.c"
+#line 8147 "TumblrPublishing.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8147 "TumblrPublishing.c"
+#line 8157 "TumblrPublishing.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 8153 "TumblrPublishing.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8163 "TumblrPublishing.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 8162 "TumblrPublishing.c"
+#line 8172 "TumblrPublishing.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8182 "TumblrPublishing.c"
+#line 8192 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
-	gint64 _tmp0_ = 0LL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 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"
@@ -8228,7 +8238,7 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (Publishin
 	result = _tmp4_;
 #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 8211 "TumblrPublishing.c"
+#line 8221 "TumblrPublishing.c"
 }
 
 
@@ -8240,8 +8250,8 @@ static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTum
 #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 8224 "TumblrPublishing.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated;
+#line 8234 "TumblrPublishing.c"
 }
 
 
@@ -8252,11 +8262,11 @@ static void publishing_tumblr_tumblr_publisher_session_instance_init (Publishing
 	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 8235 "TumblrPublishing.c"
+#line 8245 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession* obj) {
+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);
@@ -8266,7 +8276,7 @@ static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTS
 	_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 8249 "TumblrPublishing.c"
+#line 8259 "TumblrPublishing.c"
 }
 
 
@@ -8293,7 +8303,7 @@ static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumbl
 	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 8276 "TumblrPublishing.c"
+#line 8286 "TumblrPublishing.c"
 }
 
 
@@ -8301,23 +8311,27 @@ static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interfa
 #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;
+	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;
+	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;
+	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 8291 "TumblrPublishing.c"
+	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_ = NULL;
+	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"
@@ -8342,14 +8356,14 @@ static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTu
 	_tmp0_ = g_strdup ("");
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->username = _tmp0_;
-#line 8325 "TumblrPublishing.c"
+#line 8339 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) {
+static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) {
 	PublishingTumblrTumblrPublisher * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	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"
@@ -8382,7 +8396,7 @@ static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) {
 	_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 8365 "TumblrPublishing.c"
+#line 8379 "TumblrPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 54894d6..492f100 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.34.7, the Vala compiler
+/* YandexPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from YandexPublishing.vala, do not modify */
 
 /* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>
@@ -87,6 +87,12 @@ typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePr
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_match_info_unref0(var) ((var == NULL) ? NULL : (var = (g_match_info_unref (var), NULL)))
 #define __vala_WebKitNavigationAction_free0(var) ((var == NULL) ? NULL : (var = (_vala_WebKitNavigationAction_free (var), NULL)))
+enum  {
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL,
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL,
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL
+};
+static guint publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL] = {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))
@@ -110,6 +116,12 @@ typedef struct _PublishingYandexParamSpecPublishOptions PublishingYandexParamSpe
 typedef struct _PublishingYandexPublishingOptionsPane PublishingYandexPublishingOptionsPane;
 typedef struct _PublishingYandexPublishingOptionsPaneClass PublishingYandexPublishingOptionsPaneClass;
 typedef struct _PublishingYandexPublishingOptionsPanePrivate PublishingYandexPublishingOptionsPanePrivate;
+enum  {
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {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))
@@ -274,18 +286,18 @@ struct _PublishingYandexYandexPublisherPrivate {
 
 
 static gpointer yandex_service_parent_class = NULL;
-static SpitPluggableIface* yandex_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* yandex_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * yandex_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * yandex_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_yandex_transaction_parent_class = NULL;
 static gpointer publishing_yandex_session_parent_class = NULL;
 static gpointer publishing_yandex_web_auth_pane_parent_class = NULL;
 static gpointer publishing_yandex_publish_options_parent_class = NULL;
 static gpointer publishing_yandex_publishing_options_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_yandex_uploader_parent_class = NULL;
 static gpointer publishing_yandex_upload_transaction_parent_class = NULL;
 static gpointer publishing_yandex_yandex_publisher_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL;
 
 GType yandex_service_get_type (void) G_GNUC_CONST;
 enum  {
@@ -326,7 +338,7 @@ 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);
-static void publishing_yandex_session_finalize (PublishingRESTSupportSession* obj);
+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  {
@@ -340,7 +352,7 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie
 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);
+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);
@@ -353,7 +365,7 @@ enum  {
 };
 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);
+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  {
@@ -369,7 +381,7 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
 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_finalize (GObject* obj);
+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  {
@@ -381,7 +393,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
 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);
+static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 enum  {
 	PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY
 };
@@ -438,7 +450,7 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand
 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 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 gint _vala_array_length (gpointer array);
@@ -447,9 +459,9 @@ 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) {
 	YandexService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 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"
@@ -462,7 +474,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 466 "YandexPublishing.c"
+#line 478 "YandexPublishing.c"
 }
 
 
@@ -475,7 +487,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.yandex-fotki";
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 479 "YandexPublishing.c"
+#line 491 "YandexPublishing.c"
 }
 
 
@@ -488,21 +500,19 @@ 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 492 "YandexPublishing.c"
+#line 504 "YandexPublishing.c"
 }
 
 
 static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	YandexService * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -514,56 +524,52 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).authors = _tmp0_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = _ ("Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>");
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"));
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).translators);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).version);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).version = _tmp4_;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = _ ("Visit the Yandex.Fotki web site");
+	(*info).version = _tmp3_;
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp4_ = g_strdup (_ ("Visit the Yandex.Fotki web site"));
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).website_name = _tmp6_;
+	(*info).website_name = _tmp4_;
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp7_ = g_strdup ("https://fotki.yandex.ru/");
+	_tmp5_ = g_strdup ("https://fotki.yandex.ru/");
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).website_url = _tmp7_;
+	(*info).website_url = _tmp5_;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp8_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).license);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).license = _tmp8_;
-#line 559 "YandexPublishing.c"
+	(*info).license = _tmp6_;
+#line 565 "YandexPublishing.c"
 }
 
 
 static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	YandexService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingYandexYandexPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingYandexYandexPublisher* _tmp1_;
 #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"
@@ -576,7 +582,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 580 "YandexPublishing.c"
+#line 586 "YandexPublishing.c"
 }
 
 
@@ -589,7 +595,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 593 "YandexPublishing.c"
+#line 599 "YandexPublishing.c"
 }
 
 
@@ -597,7 +603,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable
 	YandexService * self;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 601 "YandexPublishing.c"
+#line 607 "YandexPublishing.c"
 }
 
 
@@ -607,21 +613,21 @@ YandexService* yandex_service_construct (GType object_type) {
 	self = (YandexService*) g_object_new (object_type, NULL);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 611 "YandexPublishing.c"
+#line 617 "YandexPublishing.c"
 }
 
 
 YandexService* yandex_service_new (void) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 618 "YandexPublishing.c"
+#line 624 "YandexPublishing.c"
 }
 
 
 static void yandex_service_class_init (YandexServiceClass * klass) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 625 "YandexPublishing.c"
+#line 631 "YandexPublishing.c"
 }
 
 
@@ -629,16 +635,16 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
 #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"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) yandex_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) yandex_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) yandex_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) yandex_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) yandex_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) yandex_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info;
+	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 642 "YandexPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) yandex_service_real_activation;
+#line 648 "YandexPublishing.c"
 }
 
 
@@ -646,10 +652,10 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin
 #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;
+	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 653 "YandexPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) yandex_service_real_get_supported_media;
+#line 659 "YandexPublishing.c"
 }
 
 
@@ -675,9 +681,9 @@ GType yandex_service_get_type (void) {
 
 PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type, PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
 	PublishingYandexTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
+	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"
@@ -694,22 +700,22 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G
 	publishing_yandex_transaction_add_headers (self);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 698 "YandexPublishing.c"
+#line 704 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 705 "YandexPublishing.c"
+#line 711 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self) {
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingYandexSession* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	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"
@@ -724,13 +730,13 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp3_) {
-#line 728 "YandexPublishing.c"
-		PublishingRESTSupportSession* _tmp4_ = NULL;
-		PublishingYandexSession* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 734 "YandexPublishing.c"
+		PublishingRESTSupportSession* _tmp4_;
+		PublishingYandexSession* _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));
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -753,15 +759,15 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 		_publishing_rest_support_session_unref0 (_tmp5_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 757 "YandexPublishing.c"
+#line 763 "YandexPublishing.c"
 	}
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingYandexTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+	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"
@@ -774,20 +780,20 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje
 	publishing_yandex_transaction_add_headers (self);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 778 "YandexPublishing.c"
+#line 784 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 785 "YandexPublishing.c"
+#line 791 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, const gchar* type, const gchar* data) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #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"
@@ -800,14 +806,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
 	_tmp1_ = type;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 804 "YandexPublishing.c"
+#line 810 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 811 "YandexPublishing.c"
+#line 817 "YandexPublishing.c"
 }
 
 
@@ -833,21 +839,21 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type)
 	self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 837 "YandexPublishing.c"
+#line 843 "YandexPublishing.c"
 }
 
 
 PublishingYandexSession* publishing_yandex_session_new (void) {
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 844 "YandexPublishing.c"
+#line 850 "YandexPublishing.c"
 }
 
 
 static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base) {
 	PublishingYandexSession * self;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -856,7 +862,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
 	result = _tmp0_ != NULL;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 860 "YandexPublishing.c"
+#line 866 "YandexPublishing.c"
 }
 
 
@@ -867,13 +873,13 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
 	_g_free0 (self->priv->auth_token);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 871 "YandexPublishing.c"
+#line 877 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #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"
@@ -886,14 +892,14 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co
 	_g_free0 (self->priv->auth_token);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = _tmp1_;
-#line 890 "YandexPublishing.c"
+#line 896 "YandexPublishing.c"
 }
 
 
 gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (self), NULL);
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -904,7 +910,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
 	result = _tmp1_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 908 "YandexPublishing.c"
+#line 914 "YandexPublishing.c"
 }
 
 
@@ -916,8 +922,8 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	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 921 "YandexPublishing.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_yandex_session_real_is_authenticated;
+#line 927 "YandexPublishing.c"
 }
 
 
@@ -926,11 +932,11 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s
 	self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 930 "YandexPublishing.c"
+#line 936 "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);
@@ -938,7 +944,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob
 	_g_free0 (self->priv->auth_token);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 942 "YandexPublishing.c"
+#line 948 "YandexPublishing.c"
 }
 
 
@@ -956,7 +962,7 @@ GType publishing_yandex_session_get_type (void) {
 
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
 	PublishingYandexWebAuthPane * self = NULL;
-	const gchar* _tmp0_ = 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"
@@ -965,14 +971,14 @@ PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType ob
 	self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 969 "YandexPublishing.c"
+#line 975 "YandexPublishing.c"
 }
 
 
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 976 "YandexPublishing.c"
+#line 982 "YandexPublishing.c"
 }
 
 
@@ -981,22 +987,22 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie
 	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 985 "YandexPublishing.c"
+#line 991 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 	PublishingYandexWebAuthPane * self;
-	WebKitWebView* _tmp3_ = NULL;
-	WebKitWebView* _tmp4_ = NULL;
+	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 996 "YandexPublishing.c"
+#line 1002 "YandexPublishing.c"
 	{
 		GRegex* _tmp0_ = NULL;
-		GRegex* _tmp1_ = NULL;
-		GRegex* _tmp2_ = NULL;
+		GRegex* _tmp1_;
+		GRegex* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp1_ = g_regex_new ("(.*)#access_token=([a-zA-Z0-9]*)&", 0, 0, &_inner_error_);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1005,7 +1011,7 @@ 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 1009 "YandexPublishing.c"
+#line 1015 "YandexPublishing.c"
 				goto __catch39_g_regex_error;
 			}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1014,7 +1020,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 1018 "YandexPublishing.c"
+#line 1024 "YandexPublishing.c"
 		}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = _tmp0_;
@@ -1026,7 +1032,7 @@ 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 1030 "YandexPublishing.c"
+#line 1036 "YandexPublishing.c"
 	}
 	goto __finally39;
 	__catch39_g_regex_error:
@@ -1040,7 +1046,7 @@ 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 1044 "YandexPublishing.c"
+#line 1050 "YandexPublishing.c"
 	}
 	__finally39:
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1051,7 +1057,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 1055 "YandexPublishing.c"
+#line 1061 "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));
@@ -1061,7 +1067,7 @@ 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 1065 "YandexPublishing.c"
+#line 1071 "YandexPublishing.c"
 }
 
 
@@ -1069,41 +1075,41 @@ static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCo
 	PublishingYandexWebAuthPane * self;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1073 "YandexPublishing.c"
+#line 1079 "YandexPublishing.c"
 }
 
 
 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 1080 "YandexPublishing.c"
+#line 1086 "YandexPublishing.c"
 }
 
 
 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 1087 "YandexPublishing.c"
+#line 1093 "YandexPublishing.c"
 }
 
 
 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 1094 "YandexPublishing.c"
+#line 1100 "YandexPublishing.c"
 }
 
 
 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 1101 "YandexPublishing.c"
+#line 1107 "YandexPublishing.c"
 }
 
 
 static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type) {
 	gboolean result = FALSE;
-	WebKitPolicyDecisionType _tmp0_ = 0;
+	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"
@@ -1114,29 +1120,29 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 	switch (_tmp0_) {
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1118 "YandexPublishing.c"
+#line 1124 "YandexPublishing.c"
 		{
 			WebKitNavigationPolicyDecision* n_decision = NULL;
-			WebKitPolicyDecision* _tmp1_ = NULL;
-			WebKitNavigationPolicyDecision* _tmp2_ = NULL;
+			WebKitPolicyDecision* _tmp1_;
+			WebKitNavigationPolicyDecision* _tmp2_;
 			WebKitNavigationAction* action = NULL;
-			WebKitNavigationPolicyDecision* _tmp3_ = NULL;
-			WebKitNavigationAction* _tmp4_ = NULL;
-			WebKitNavigationAction* _tmp5_ = NULL;
-			WebKitNavigationAction* _tmp6_ = NULL;
+			WebKitNavigationPolicyDecision* _tmp3_;
+			WebKitNavigationAction* _tmp4_;
+			WebKitNavigationAction* _tmp5_;
+			WebKitNavigationAction* _tmp6_;
 			gchar* uri = NULL;
-			WebKitNavigationAction* _tmp7_ = NULL;
-			WebKitURIRequest* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
+			WebKitNavigationAction* _tmp7_;
+			WebKitURIRequest* _tmp8_;
+			const gchar* _tmp9_;
+			const gchar* _tmp10_;
+			gchar* _tmp11_;
+			const gchar* _tmp12_;
 			GMatchInfo* info = NULL;
-			GRegex* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
+			GRegex* _tmp13_;
+			const gchar* _tmp14_;
 			GMatchInfo* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
-			WebKitPolicyDecision* _tmp28_ = NULL;
+			gboolean _tmp16_;
+			WebKitPolicyDecision* _tmp28_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp1_ = decision;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1183,18 +1189,18 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			info = _tmp15_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_tmp16_) {
-#line 1187 "YandexPublishing.c"
+#line 1193 "YandexPublishing.c"
 				gchar* access_token = NULL;
-				GMatchInfo* _tmp17_ = NULL;
-				gchar** _tmp18_ = NULL;
-				gchar** _tmp19_ = NULL;
-				gchar** _tmp20_ = NULL;
-				gint _tmp20__length1 = 0;
-				const gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
+				GMatchInfo* _tmp17_;
+				gchar** _tmp18_;
+				gchar** _tmp19_;
+				gchar** _tmp20_;
+				gint _tmp20__length1;
+				const gchar* _tmp21_;
+				gchar* _tmp22_;
+				gchar* _tmp23_;
+				const gchar* _tmp24_;
+				const gchar* _tmp25_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp17_ = info;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1223,13 +1229,13 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 				_tmp25_ = access_token;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp25_ != NULL) {
-#line 1227 "YandexPublishing.c"
-					const gchar* _tmp26_ = NULL;
-					WebKitPolicyDecision* _tmp27_ = NULL;
+#line 1233 "YandexPublishing.c"
+					const gchar* _tmp26_;
+					WebKitPolicyDecision* _tmp27_;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp26_ = access_token;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_signal_emit_by_name (self, "login-succeeded", _tmp26_);
+					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;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1246,15 +1252,15 @@ 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 1250 "YandexPublishing.c"
+#line 1256 "YandexPublishing.c"
 				} else {
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_signal_emit_by_name (self, "login-failed");
-#line 1254 "YandexPublishing.c"
+					g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL], 0);
+#line 1260 "YandexPublishing.c"
 				}
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (access_token);
-#line 1258 "YandexPublishing.c"
+#line 1264 "YandexPublishing.c"
 			}
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp28_ = decision;
@@ -1270,20 +1276,20 @@ 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 1274 "YandexPublishing.c"
+#line 1280 "YandexPublishing.c"
 		}
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1278 "YandexPublishing.c"
+#line 1284 "YandexPublishing.c"
 		{
-			WebKitPolicyDecision* _tmp29_ = NULL;
+			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_);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1287 "YandexPublishing.c"
+#line 1293 "YandexPublishing.c"
 		}
 		default:
 		{
@@ -1291,14 +1297,14 @@ 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 1295 "YandexPublishing.c"
+#line 1301 "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 1302 "YandexPublishing.c"
+#line 1308 "YandexPublishing.c"
 }
 
 
@@ -1308,27 +1314,27 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexWebAuthPanePrivate));
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_yandex_web_auth_pane_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_yandex_web_auth_pane_real_constructed;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_yandex_web_auth_pane_real_on_page_load;
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_yandex_web_auth_pane_real_on_page_load;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_web_auth_pane_finalize;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+	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"
-	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 1321 "YandexPublishing.c"
+	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"
 }
 
 
 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 1328 "YandexPublishing.c"
+#line 1334 "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);
@@ -1336,7 +1342,7 @@ 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 1340 "YandexPublishing.c"
+#line 1346 "YandexPublishing.c"
 }
 
 
@@ -1358,21 +1364,21 @@ PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GTy
 	self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1362 "YandexPublishing.c"
+#line 1368 "YandexPublishing.c"
 }
 
 
 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 1369 "YandexPublishing.c"
+#line 1375 "YandexPublishing.c"
 }
 
 
 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 1376 "YandexPublishing.c"
+#line 1382 "YandexPublishing.c"
 }
 
 
@@ -1381,7 +1387,7 @@ static void publishing_yandex_value_publish_options_free_value (GValue* value) {
 	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 1385 "YandexPublishing.c"
+#line 1391 "YandexPublishing.c"
 	}
 }
 
@@ -1391,11 +1397,11 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
 	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 1395 "YandexPublishing.c"
+#line 1401 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1399 "YandexPublishing.c"
+#line 1405 "YandexPublishing.c"
 	}
 }
 
@@ -1403,66 +1409,66 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
 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 1407 "YandexPublishing.c"
+#line 1413 "YandexPublishing.c"
 }
 
 
 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 1414 "YandexPublishing.c"
-		PublishingYandexPublishOptions* object;
+#line 1420 "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 1421 "YandexPublishing.c"
+#line 1427 "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 1425 "YandexPublishing.c"
+#line 1431 "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 1429 "YandexPublishing.c"
+#line 1435 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1433 "YandexPublishing.c"
+#line 1439 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1437 "YandexPublishing.c"
+#line 1443 "YandexPublishing.c"
 }
 
 
 static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingYandexPublishOptions** object_p;
+	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 1448 "YandexPublishing.c"
+#line 1454 "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 1454 "YandexPublishing.c"
+#line 1460 "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 1458 "YandexPublishing.c"
+#line 1464 "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 1462 "YandexPublishing.c"
+#line 1468 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1466 "YandexPublishing.c"
+#line 1472 "YandexPublishing.c"
 }
 
 
@@ -1476,7 +1482,7 @@ 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 1480 "YandexPublishing.c"
+#line 1486 "YandexPublishing.c"
 }
 
 
@@ -1485,12 +1491,12 @@ gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
 	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 1489 "YandexPublishing.c"
+#line 1495 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object) {
-	PublishingYandexPublishOptions* old;
+	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));
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1505,23 +1511,23 @@ 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 1509 "YandexPublishing.c"
+#line 1515 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1513 "YandexPublishing.c"
+#line 1519 "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 1519 "YandexPublishing.c"
+#line 1525 "YandexPublishing.c"
 	}
 }
 
 
 void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object) {
-	PublishingYandexPublishOptions* old;
+	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));
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1534,17 +1540,17 @@ 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 1538 "YandexPublishing.c"
+#line 1544 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1542 "YandexPublishing.c"
+#line 1548 "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 1548 "YandexPublishing.c"
+#line 1554 "YandexPublishing.c"
 	}
 }
 
@@ -1554,7 +1560,7 @@ static void publishing_yandex_publish_options_class_init (PublishingYandexPublis
 	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 1558 "YandexPublishing.c"
+#line 1564 "YandexPublishing.c"
 }
 
 
@@ -1569,11 +1575,11 @@ 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 1573 "YandexPublishing.c"
+#line 1579 "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);
@@ -1585,7 +1591,7 @@ 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 1589 "YandexPublishing.c"
+#line 1595 "YandexPublishing.c"
 }
 
 
@@ -1604,18 +1610,18 @@ GType publishing_yandex_publish_options_get_type (void) {
 
 
 gpointer publishing_yandex_publish_options_ref (gpointer instance) {
-	PublishingYandexPublishOptions* self;
+	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 1614 "YandexPublishing.c"
+#line 1620 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_publish_options_unref (gpointer instance) {
-	PublishingYandexPublishOptions* self;
+	PublishingYandexPublishOptions * self;
 	self = instance;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1623,7 +1629,7 @@ 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 1627 "YandexPublishing.c"
+#line 1633 "YandexPublishing.c"
 	}
 }
 
@@ -1637,7 +1643,7 @@ 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 1641 "YandexPublishing.c"
+#line 1647 "YandexPublishing.c"
 }
 
 
@@ -1645,7 +1651,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_installed (Sp
 	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 1649 "YandexPublishing.c"
+#line 1655 "YandexPublishing.c"
 }
 
 
@@ -1653,15 +1659,15 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (
 	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 1657 "YandexPublishing.c"
+#line 1663 "YandexPublishing.c"
 }
 
 
 static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingYandexPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1672,28 +1678,28 @@ 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 1676 "YandexPublishing.c"
+#line 1682 "YandexPublishing.c"
 }
 
 
 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 1683 "YandexPublishing.c"
+#line 1689 "YandexPublishing.c"
 }
 
 
 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 1690 "YandexPublishing.c"
+#line 1696 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type, PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
 	PublishingYandexPublishingOptionsPane * self = NULL;
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	GtkBox* _tmp1_ = NULL;
+	PublishingYandexPublishOptions* _tmp0_;
+	GtkBox* _tmp1_;
 	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);
@@ -1715,33 +1721,33 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 	_g_object_unref0 (self->priv->box);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->box = _tmp1_;
-#line 1719 "YandexPublishing.c"
+#line 1725 "YandexPublishing.c"
 	{
-		GtkBuilder* _tmp2_ = NULL;
-		GtkBuilder* _tmp3_ = NULL;
-		GtkBuilder* _tmp4_ = NULL;
+		GtkBuilder* _tmp2_;
+		GtkBuilder* _tmp3_;
+		GtkBuilder* _tmp4_;
 		GtkWidget* content = NULL;
-		GtkBuilder* _tmp5_ = NULL;
-		GObject* _tmp6_ = NULL;
-		GtkWidget* _tmp7_ = NULL;
-		GtkBuilder* _tmp8_ = NULL;
-		GObject* _tmp9_ = NULL;
-		GtkComboBoxText* _tmp10_ = NULL;
-		GtkComboBoxText* _tmp23_ = NULL;
-		GtkBuilder* _tmp24_ = NULL;
-		GObject* _tmp25_ = NULL;
-		GtkButton* _tmp26_ = NULL;
-		GtkBuilder* _tmp27_ = NULL;
-		GObject* _tmp28_ = NULL;
-		GtkButton* _tmp29_ = NULL;
-		GtkButton* _tmp30_ = NULL;
-		GtkButton* _tmp31_ = NULL;
-		GtkWidget* _tmp32_ = NULL;
-		GtkContainer* _tmp33_ = NULL;
-		GtkContainer* _tmp34_ = NULL;
-		GtkWidget* _tmp35_ = NULL;
-		GtkBox* _tmp36_ = NULL;
-		GtkWidget* _tmp37_ = NULL;
+		GtkBuilder* _tmp5_;
+		GObject* _tmp6_;
+		GtkWidget* _tmp7_;
+		GtkBuilder* _tmp8_;
+		GObject* _tmp9_;
+		GtkComboBoxText* _tmp10_;
+		GtkComboBoxText* _tmp23_;
+		GtkBuilder* _tmp24_;
+		GObject* _tmp25_;
+		GtkButton* _tmp26_;
+		GtkBuilder* _tmp27_;
+		GObject* _tmp28_;
+		GtkButton* _tmp29_;
+		GtkButton* _tmp30_;
+		GtkButton* _tmp31_;
+		GtkWidget* _tmp32_;
+		GtkContainer* _tmp33_;
+		GtkContainer* _tmp34_;
+		GtkWidget* _tmp35_;
+		GtkBox* _tmp36_;
+		GtkWidget* _tmp37_;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = gtk_builder_new ();
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1754,7 +1760,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		gtk_builder_add_from_resource (_tmp3_, 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 1758 "YandexPublishing.c"
+#line 1764 "YandexPublishing.c"
 			goto __catch40_g_error;
 		}
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1779,15 +1785,15 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		_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 1783 "YandexPublishing.c"
+#line 1789 "YandexPublishing.c"
 		{
 			GeeIterator* _key_it = NULL;
-			GeeHashMap* _tmp11_ = NULL;
-			GeeSet* _tmp12_ = NULL;
-			GeeSet* _tmp13_ = NULL;
-			GeeSet* _tmp14_ = NULL;
-			GeeIterator* _tmp15_ = NULL;
-			GeeIterator* _tmp16_ = NULL;
+			GeeHashMap* _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;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1806,14 +1812,14 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 			_key_it = _tmp16_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 1810 "YandexPublishing.c"
-				GeeIterator* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+#line 1816 "YandexPublishing.c"
+				GeeIterator* _tmp17_;
+				gboolean _tmp18_;
 				gchar* key = NULL;
-				GeeIterator* _tmp19_ = NULL;
-				gpointer _tmp20_ = NULL;
-				GtkComboBoxText* _tmp21_ = NULL;
-				const gchar* _tmp22_ = 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;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1822,7 +1828,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				if (!_tmp18_) {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1826 "YandexPublishing.c"
+#line 1832 "YandexPublishing.c"
 				}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = _key_it;
@@ -1838,11 +1844,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (key);
-#line 1842 "YandexPublishing.c"
+#line 1848 "YandexPublishing.c"
 			}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (_key_it);
-#line 1846 "YandexPublishing.c"
+#line 1852 "YandexPublishing.c"
 		}
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp23_ = self->priv->album_list;
@@ -1894,14 +1900,14 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (content);
-#line 1898 "YandexPublishing.c"
+#line 1904 "YandexPublishing.c"
 	}
 	goto __finally40;
 	__catch40_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
+		GError* _tmp38_;
+		const gchar* _tmp39_;
 #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"
@@ -1914,7 +1920,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1918 "YandexPublishing.c"
+#line 1924 "YandexPublishing.c"
 	}
 	__finally40:
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1925,18 +1931,18 @@ 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 1929 "YandexPublishing.c"
+#line 1935 "YandexPublishing.c"
 	}
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1933 "YandexPublishing.c"
+#line 1939 "YandexPublishing.c"
 }
 
 
 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 1940 "YandexPublishing.c"
+#line 1946 "YandexPublishing.c"
 }
 
 
@@ -1944,36 +1950,36 @@ static void publishing_yandex_publishing_options_pane_on_logout_clicked (Publish
 #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_by_name (self, "logout");
-#line 1949 "YandexPublishing.c"
+	g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 1955 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self) {
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	PublishingYandexPublishOptions* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gchar* _tmp2_;
 	GtkCheckButton* tmp = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkCheckButton* _tmp5_ = NULL;
-	PublishingYandexPublishOptions* _tmp6_ = NULL;
-	GtkCheckButton* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkCheckButton* _tmp12_ = NULL;
-	PublishingYandexPublishOptions* _tmp13_ = NULL;
-	GtkCheckButton* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkCheckButton* _tmp5_;
+	PublishingYandexPublishOptions* _tmp6_;
+	GtkCheckButton* _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
+	GtkBuilder* _tmp10_;
+	GObject* _tmp11_;
+	GtkCheckButton* _tmp12_;
+	PublishingYandexPublishOptions* _tmp13_;
+	GtkCheckButton* _tmp14_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
 	GtkComboBoxText* access_type = NULL;
-	GtkBuilder* _tmp17_ = NULL;
-	GObject* _tmp18_ = NULL;
-	GtkComboBoxText* _tmp19_ = NULL;
-	PublishingYandexPublishOptions* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
+	GtkBuilder* _tmp17_;
+	GObject* _tmp18_;
+	GtkComboBoxText* _tmp19_;
+	PublishingYandexPublishOptions* _tmp20_;
+	gchar* _tmp21_;
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2041,12 +2047,12 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp20_->access_type = _tmp21_;
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_emit_by_name (self, "publish");
+	g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (access_type);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (tmp);
-#line 2050 "YandexPublishing.c"
+#line 2056 "YandexPublishing.c"
 }
 
 
@@ -2058,10 +2064,10 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_publishing_options_pane_finalize;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	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"
-	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 2065 "YandexPublishing.c"
+	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"
 }
 
 
@@ -2069,25 +2075,25 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan
 #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"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_on_pane_installed;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
+	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 2080 "YandexPublishing.c"
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_widget;
+#line 2086 "YandexPublishing.c"
 }
 
 
 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 2087 "YandexPublishing.c"
+#line 2093 "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);
@@ -2103,7 +2109,7 @@ 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 2107 "YandexPublishing.c"
+#line 2113 "YandexPublishing.c"
 }
 
 
@@ -2123,10 +2129,10 @@ 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* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingYandexPublishOptions* _tmp2_ = 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"
@@ -2145,27 +2151,27 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ
 	self->priv->options = _tmp2_;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2149 "YandexPublishing.c"
+#line 2155 "YandexPublishing.c"
 }
 
 
 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 2156 "YandexPublishing.c"
+#line 2162 "YandexPublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingYandexUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingYandexSession* _tmp1_ = NULL;
-	PublishingYandexPublishOptions* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	PublishingYandexUploadTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingYandexSession* _tmp1_;
+	PublishingYandexPublishOptions* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
+	PublishingYandexUploadTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2194,7 +2200,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
 	result = _tmp6_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2198 "YandexPublishing.c"
+#line 2204 "YandexPublishing.c"
 }
 
 
@@ -2206,25 +2212,25 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	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 2211 "YandexPublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction;
+#line 2217 "YandexPublishing.c"
 }
 
 
 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 2218 "YandexPublishing.c"
+#line 2224 "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 2228 "YandexPublishing.c"
+#line 2234 "YandexPublishing.c"
 }
 
 
@@ -2242,26 +2248,26 @@ GType publishing_yandex_uploader_get_type (void) {
 
 static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (self) {
-#line 2248 "YandexPublishing.c"
-		gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2254 "YandexPublishing.c"
+		gchar* _tmp0_;
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2256 "YandexPublishing.c"
+#line 2262 "YandexPublishing.c"
 	} else {
-		gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp1_;
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2265 "YandexPublishing.c"
+#line 2271 "YandexPublishing.c"
 	}
 }
 
@@ -2269,142 +2275,142 @@ static gchar* bool_to_string (gboolean 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 2273 "YandexPublishing.c"
+#line 2279 "YandexPublishing.c"
 }
 
 
 static guint8* string_get_data (const gchar* self, int* result_length1) {
 	guint8* result;
 	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	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 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2317 "YandexPublishing.c"
+#line 2323 "YandexPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2323 "YandexPublishing.c"
+#line 2329 "YandexPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	var = (g_free (var), NULL);
-#line 2330 "YandexPublishing.c"
+#line 2336 "YandexPublishing.c"
 }
 
 
 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 2337 "YandexPublishing.c"
+#line 2343 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
 	PublishingYandexUploadTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	PublishingYandexPublishOptions* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingYandexPublishOptions* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	PublishingYandexPublishOptions* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	PublishingYandexSession* _tmp0_;
+	PublishingYandexPublishOptions* _tmp1_;
+	const gchar* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingYandexPublishOptions* _tmp6_;
+	const gchar* _tmp7_;
+	PublishingYandexPublishOptions* _tmp8_;
+	const gchar* _tmp9_;
 	SoupMultipart* message_parts = NULL;
-	SoupMultipart* _tmp10_ = NULL;
-	SpitPublishingPublishable* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	PublishingYandexPublishOptions* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	PublishingYandexPublishOptions* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	PublishingYandexPublishOptions* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
+	SoupMultipart* _tmp10_;
+	SpitPublishingPublishable* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	PublishingYandexPublishOptions* _tmp14_;
+	gboolean _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_ = 0;
+	gint _tmp40_;
 	SoupBuffer* bindable_data = NULL;
-	guint8* _tmp41_ = NULL;
-	gint _tmp41__length1 = 0;
-	guint8* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	SoupBuffer* _tmp43_ = NULL;
-	SpitPublishingPublishable* _tmp44_ = NULL;
-	GFile* _tmp45_ = NULL;
-	GFile* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
+	guint8* _tmp41_;
+	gint _tmp41__length1;
+	guint8* _tmp42_;
+	gint _tmp42__length1;
+	SoupBuffer* _tmp43_;
+	SpitPublishingPublishable* _tmp44_;
+	GFile* _tmp45_;
+	GFile* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
 	SoupMessageHeaders* image_part_header = NULL;
 	SoupBuffer* image_part_body = NULL;
 	SoupMessageHeaders* _tmp49_ = NULL;
 	SoupBuffer* _tmp50_ = NULL;
 	GHashTable* _result_ = NULL;
-	GHashFunc _tmp51_ = NULL;
-	GEqualFunc _tmp52_ = NULL;
-	GHashTable* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
+	GHashFunc _tmp51_;
+	GEqualFunc _tmp52_;
+	GHashTable* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	SoupMessage* _tmp60_ = NULL;
-	SoupMessage* _tmp61_ = NULL;
-	SoupMessageHeaders* _tmp62_ = NULL;
-	PublishingYandexSession* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	SoupMessageHeaders* _tmp68_ = NULL;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	SoupMessage* _tmp60_;
+	SoupMessage* _tmp61_;
+	SoupMessageHeaders* _tmp62_;
+	PublishingYandexSession* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
+	gchar* _tmp66_;
+	gchar* _tmp67_;
+	SoupMessageHeaders* _tmp68_;
 	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);
@@ -2490,13 +2496,13 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	soup_multipart_append_form_string (message_parts, "access", _tmp25_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp25_);
-#line 2494 "YandexPublishing.c"
+#line 2500 "YandexPublishing.c"
 	{
-		SpitPublishingPublishable* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		SpitPublishingPublishable* _tmp26_;
+		GFile* _tmp27_;
+		GFile* _tmp28_;
+		gchar* _tmp29_;
+		gchar* _tmp30_;
 		gchar* _tmp31_ = NULL;
 		gsize _tmp32_ = 0UL;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2525,7 +2531,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		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 2529 "YandexPublishing.c"
+#line 2535 "YandexPublishing.c"
 				goto __catch41_g_file_error;
 			}
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2538,20 +2544,20 @@ 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 2542 "YandexPublishing.c"
+#line 2548 "YandexPublishing.c"
 		}
 	}
 	goto __finally41;
 	__catch41_g_file_error:
 	{
 		GError* e = NULL;
-		SpitPublishingPublishable* _tmp33_ = NULL;
-		GFile* _tmp34_ = NULL;
-		GFile* _tmp35_ = NULL;
-		gchar* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
-		GError* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
+		SpitPublishingPublishable* _tmp33_;
+		GFile* _tmp34_;
+		GFile* _tmp35_;
+		gchar* _tmp36_;
+		gchar* _tmp37_;
+		GError* _tmp38_;
+		const gchar* _tmp39_;
 #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"
@@ -2578,7 +2584,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		_g_object_unref0 (_tmp35_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 2582 "YandexPublishing.c"
+#line 2588 "YandexPublishing.c"
 	}
 	__finally41:
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2593,7 +2599,7 @@ 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 2597 "YandexPublishing.c"
+#line 2603 "YandexPublishing.c"
 	}
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp40_ = soup_multipart_get_length (message_parts);
@@ -2701,21 +2707,21 @@ 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 2705 "YandexPublishing.c"
+#line 2711 "YandexPublishing.c"
 }
 
 
 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 2712 "YandexPublishing.c"
+#line 2718 "YandexPublishing.c"
 }
 
 
 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 2719 "YandexPublishing.c"
+#line 2725 "YandexPublishing.c"
 }
 
 
@@ -2737,11 +2743,11 @@ GType publishing_yandex_upload_transaction_get_type (void) {
 
 PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingYandexYandexPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingYandexSession* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	PublishingYandexPublishOptions* _tmp4_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingYandexSession* _tmp2_;
+	GeeHashMap* _tmp3_;
+	PublishingYandexPublishOptions* _tmp4_;
 #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"
@@ -2776,21 +2782,21 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
 	self->priv->options = _tmp4_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2780 "YandexPublishing.c"
+#line 2786 "YandexPublishing.c"
 }
 
 
 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 2787 "YandexPublishing.c"
+#line 2793 "YandexPublishing.c"
 }
 
 
 gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2801,13 +2807,13 @@ 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 2805 "YandexPublishing.c"
+#line 2811 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -2818,27 +2824,27 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan
 	_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 2822 "YandexPublishing.c"
+#line 2828 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_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 2834 "YandexPublishing.c"
+#line 2840 "YandexPublishing.c"
 }
 
 
 gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self) {
 	gboolean result = FALSE;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), FALSE);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2853,14 +2859,14 @@ 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 2857 "YandexPublishing.c"
+#line 2863 "YandexPublishing.c"
 }
 
 
 static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingYandexYandexPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2869,15 +2875,15 @@ 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 2873 "YandexPublishing.c"
+#line 2879 "YandexPublishing.c"
 }
 
 
 static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingYandexYandexPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2888,7 +2894,7 @@ 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 2892 "YandexPublishing.c"
+#line 2898 "YandexPublishing.c"
 }
 
 
@@ -2902,7 +2908,7 @@ 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 2906 "YandexPublishing.c"
+#line 2912 "YandexPublishing.c"
 }
 
 
@@ -2915,45 +2921,45 @@ 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 2919 "YandexPublishing.c"
+#line 2925 "YandexPublishing.c"
 	{
 		xmlNode* c = NULL;
-		xmlNode* _tmp0_ = NULL;
-		xmlNode* _tmp1_ = NULL;
+		xmlNode* _tmp0_;
+		xmlNode* _tmp1_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp0_ = e;
 #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 2930 "YandexPublishing.c"
+#line 2936 "YandexPublishing.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp2_ = TRUE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 2937 "YandexPublishing.c"
-				xmlNode* _tmp5_ = NULL;
-				xmlNode* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
+#line 2943 "YandexPublishing.c"
+				xmlNode* _tmp5_;
+				xmlNode* _tmp6_;
+				const gchar* _tmp7_;
 				gboolean _tmp10_ = FALSE;
-				xmlNode* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+				xmlNode* _tmp11_;
+				const gchar* _tmp12_;
 				gboolean _tmp18_ = FALSE;
-				const gchar* _tmp19_ = NULL;
+				const gchar* _tmp19_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp2_) {
-#line 2948 "YandexPublishing.c"
-					xmlNode* _tmp3_ = NULL;
-					xmlNode* _tmp4_ = NULL;
+#line 2954 "YandexPublishing.c"
+					xmlNode* _tmp3_;
+					xmlNode* _tmp4_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp3_ = c;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp4_ = _tmp3_->next;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					c = _tmp4_;
-#line 2957 "YandexPublishing.c"
+#line 2963 "YandexPublishing.c"
 				}
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp2_ = FALSE;
@@ -2963,7 +2969,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				if (!(_tmp5_ != NULL)) {
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 2967 "YandexPublishing.c"
+#line 2973 "YandexPublishing.c"
 				}
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = c;
@@ -2971,9 +2977,9 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				_tmp7_ = _tmp6_->name;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 2975 "YandexPublishing.c"
-					xmlNode* _tmp8_ = NULL;
-					gchar* _tmp9_ = NULL;
+#line 2981 "YandexPublishing.c"
+					xmlNode* _tmp8_;
+					gchar* _tmp9_;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp8_ = c;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2982,7 +2988,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_g_free0 (title);
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					title = _tmp9_;
-#line 2986 "YandexPublishing.c"
+#line 2992 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp11_ = c;
@@ -2990,10 +2996,10 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				_tmp12_ = _tmp11_->name;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 2994 "YandexPublishing.c"
-					xmlNode* _tmp13_ = NULL;
-					gchar* _tmp14_ = NULL;
-					gchar* _tmp15_ = NULL;
+#line 3000 "YandexPublishing.c"
+					xmlNode* _tmp13_;
+					gchar* _tmp14_;
+					gchar* _tmp15_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp13_ = c;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3004,17 +3010,17 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (_tmp15_);
-#line 3008 "YandexPublishing.c"
+#line 3014 "YandexPublishing.c"
 				} else {
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp10_ = FALSE;
-#line 3012 "YandexPublishing.c"
+#line 3018 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp10_) {
-#line 3016 "YandexPublishing.c"
-					xmlNode* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
+#line 3022 "YandexPublishing.c"
+					xmlNode* _tmp16_;
+					gchar* _tmp17_;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = c;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3023,32 +3029,32 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_g_free0 (link);
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					link = _tmp17_;
-#line 3027 "YandexPublishing.c"
+#line 3033 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = title;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp19_ != NULL) {
-#line 3033 "YandexPublishing.c"
-					const gchar* _tmp20_ = NULL;
+#line 3039 "YandexPublishing.c"
+					const gchar* _tmp20_;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = link;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = _tmp20_ != NULL;
-#line 3039 "YandexPublishing.c"
+#line 3045 "YandexPublishing.c"
 				} else {
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = FALSE;
-#line 3043 "YandexPublishing.c"
+#line 3049 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp18_) {
-#line 3047 "YandexPublishing.c"
-					const gchar* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-					GeeHashMap* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
+#line 3053 "YandexPublishing.c"
+					const gchar* _tmp21_;
+					const gchar* _tmp22_;
+					GeeHashMap* _tmp23_;
+					const gchar* _tmp24_;
+					const gchar* _tmp25_;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp21_ = title;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3073,7 +3079,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 3077 "YandexPublishing.c"
+#line 3083 "YandexPublishing.c"
 				}
 			}
 		}
@@ -3082,7 +3088,7 @@ 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 3086 "YandexPublishing.c"
+#line 3092 "YandexPublishing.c"
 }
 
 
@@ -3091,18 +3097,18 @@ static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest
 	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 3095 "YandexPublishing.c"
+#line 3101 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
 	PublishingRESTSupportXmlDocument* doc = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingRESTSupportXmlDocument* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PublishingRESTSupportXmlDocument* _tmp1_;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
-	xmlNode* _tmp3_ = NULL;
-	xmlNode* _tmp4_ = NULL;
+	PublishingRESTSupportXmlDocument* _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));
@@ -3122,7 +3128,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 3126 "YandexPublishing.c"
+#line 3132 "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);
@@ -3130,7 +3136,7 @@ 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 3134 "YandexPublishing.c"
+#line 3140 "YandexPublishing.c"
 		}
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3153,7 +3159,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 3157 "YandexPublishing.c"
+#line 3163 "YandexPublishing.c"
 		} else {
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -3163,22 +3169,22 @@ 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 3167 "YandexPublishing.c"
+#line 3173 "YandexPublishing.c"
 		}
 	}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3172 "YandexPublishing.c"
+#line 3178 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
 	PublishingRESTSupportXmlDocument* doc = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingRESTSupportXmlDocument* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PublishingRESTSupportXmlDocument* _tmp1_;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
-	xmlNode* _tmp3_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp2_;
+	xmlNode* _tmp3_;
 	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));
@@ -3198,7 +3204,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 3202 "YandexPublishing.c"
+#line 3208 "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);
@@ -3206,7 +3212,7 @@ 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 3210 "YandexPublishing.c"
+#line 3216 "YandexPublishing.c"
 		}
 	}
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3215,41 +3221,41 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 	_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	root = _tmp3_;
-#line 3219 "YandexPublishing.c"
+#line 3225 "YandexPublishing.c"
 	{
 		xmlNode* e = NULL;
-		xmlNode* _tmp4_ = NULL;
-		xmlNode* _tmp5_ = NULL;
+		xmlNode* _tmp4_;
+		xmlNode* _tmp5_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = root;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = _tmp4_->children;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _tmp5_;
-#line 3230 "YandexPublishing.c"
+#line 3236 "YandexPublishing.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp6_ = TRUE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 3237 "YandexPublishing.c"
-				xmlNode* _tmp9_ = NULL;
-				xmlNode* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-				xmlNode* _tmp12_ = NULL;
+#line 3243 "YandexPublishing.c"
+				xmlNode* _tmp9_;
+				xmlNode* _tmp10_;
+				const gchar* _tmp11_;
+				xmlNode* _tmp12_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp6_) {
-#line 3244 "YandexPublishing.c"
-					xmlNode* _tmp7_ = NULL;
-					xmlNode* _tmp8_ = NULL;
+#line 3250 "YandexPublishing.c"
+					xmlNode* _tmp7_;
+					xmlNode* _tmp8_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp7_ = e;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp8_ = _tmp7_->next;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					e = _tmp8_;
-#line 3253 "YandexPublishing.c"
+#line 3259 "YandexPublishing.c"
 				}
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = FALSE;
@@ -3259,7 +3265,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 				if (!(_tmp9_ != NULL)) {
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3263 "YandexPublishing.c"
+#line 3269 "YandexPublishing.c"
 				}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp10_ = e;
@@ -3269,7 +3275,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 				if (g_strcmp0 (_tmp11_, "entry") != 0) {
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					continue;
-#line 3273 "YandexPublishing.c"
+#line 3279 "YandexPublishing.c"
 				}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp12_ = e;
@@ -3285,7 +3291,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 3289 "YandexPublishing.c"
+#line 3295 "YandexPublishing.c"
 					} else {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
@@ -3295,7 +3301,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 3299 "YandexPublishing.c"
+#line 3305 "YandexPublishing.c"
 					}
 				}
 			}
@@ -3303,31 +3309,31 @@ 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 3307 "YandexPublishing.c"
+#line 3313 "YandexPublishing.c"
 }
 
 
 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 3314 "YandexPublishing.c"
+#line 3320 "YandexPublishing.c"
 }
 
 
 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 3321 "YandexPublishing.c"
+#line 3327 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #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"
@@ -3350,21 +3356,21 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY
 	_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 3354 "YandexPublishing.c"
+#line 3360 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GeeHashMap* _tmp9_ = NULL;
-	PublishingYandexPublishOptions* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gpointer _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GeeHashMap* _tmp9_;
+	PublishingYandexPublishOptions* _tmp10_;
+	const gchar* _tmp11_;
+	gpointer _tmp12_;
+	gchar* _tmp13_;
+	gboolean _tmp14_;
 	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));
@@ -3382,11 +3388,11 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, 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 3386 "YandexPublishing.c"
+#line 3392 "YandexPublishing.c"
 	{
-		PublishingRESTSupportTransaction* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		PublishingRESTSupportTransaction* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = t;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3401,7 +3407,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		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 3405 "YandexPublishing.c"
+#line 3411 "YandexPublishing.c"
 				goto __catch42_spit_publishing_publishing_error;
 			}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3410,15 +3416,15 @@ 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 3414 "YandexPublishing.c"
+#line 3420 "YandexPublishing.c"
 		}
 	}
 	goto __finally42;
 	__catch42_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		SpitPublishingPluginHost* _tmp7_;
+		GError* _tmp8_;
 #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"
@@ -3433,7 +3439,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		_g_error_free0 (err);
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3437 "YandexPublishing.c"
+#line 3443 "YandexPublishing.c"
 	}
 	__finally42:
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3444,7 +3450,7 @@ 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 3448 "YandexPublishing.c"
+#line 3454 "YandexPublishing.c"
 	}
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = self->priv->album_list;
@@ -3464,11 +3470,11 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 	if (_tmp14_) {
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3468 "YandexPublishing.c"
+#line 3474 "YandexPublishing.c"
 	} else {
-		SpitPublishingPluginHost* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		GError* _tmp17_ = NULL;
+		SpitPublishingPluginHost* _tmp15_;
+		GError* _tmp16_;
+		GError* _tmp17_;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp15_ = self->priv->host;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3479,22 +3485,22 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp17_);
-#line 3483 "YandexPublishing.c"
+#line 3489 "YandexPublishing.c"
 	}
 }
 
 
 static void publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self) {
 	gchar* album = NULL;
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	PublishingYandexPublishOptions* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* data = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	PublishingYandexTransaction* _tmp6_ = NULL;
+	PublishingYandexSession* _tmp4_;
+	const gchar* _tmp5_;
+	PublishingYandexTransaction* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -3525,7 +3531,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 3528 "YandexPublishing.c"
+#line 3534 "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_);
@@ -3533,7 +3539,7 @@ 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 3536 "YandexPublishing.c"
+#line 3542 "YandexPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3548,15 +3554,15 @@ 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 3551 "YandexPublishing.c"
+#line 3557 "YandexPublishing.c"
 		}
 	}
 	goto __finally43;
 	__catch43_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		SpitPublishingPluginHost* _tmp7_;
+		GError* _tmp8_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3569,7 +3575,7 @@ 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 3572 "YandexPublishing.c"
+#line 3578 "YandexPublishing.c"
 	}
 	__finally43:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3586,7 +3592,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 3589 "YandexPublishing.c"
+#line 3595 "YandexPublishing.c"
 	}
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
@@ -3594,32 +3600,32 @@ 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 3597 "YandexPublishing.c"
+#line 3603 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 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 3604 "YandexPublishing.c"
+#line 3610 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3611 "YandexPublishing.c"
+#line 3617 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gint _tmp4_ = 0;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	SpitPublishingPluginHost* _tmp9_ = NULL;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	gint _tmp4_;
+	SpitPublishingPluginHost* _tmp8_;
+	SpitPublishingPluginHost* _tmp9_;
 #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"
@@ -3640,10 +3646,10 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 	_tmp4_ = num_published;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp4_ == 0) {
-#line 3643 "YandexPublishing.c"
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+#line 3649 "YandexPublishing.c"
+		SpitPublishingPluginHost* _tmp5_;
+		GError* _tmp6_;
+		GError* _tmp7_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = self->priv->host;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3654,7 +3660,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 3657 "YandexPublishing.c"
+#line 3663 "YandexPublishing.c"
 	}
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = self->priv->host;
@@ -3664,17 +3670,17 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 	_tmp9_ = self->priv->host;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3667 "YandexPublishing.c"
+#line 3673 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #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"
@@ -3697,18 +3703,18 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex
 	_tmp5_ = _tmp4_->message;
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
-#line 3700 "YandexPublishing.c"
+#line 3706 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self, gint file_number, gdouble completed_fraction) {
-	gdouble _tmp0_ = 0.0;
-	SpitPublishingProgressCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
+	gdouble _tmp0_;
+	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"
@@ -3732,38 +3738,38 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish
 	_tmp4_ = completed_fraction;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 3734 "YandexPublishing.c"
+#line 3740 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 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 3741 "YandexPublishing.c"
+#line 3747 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
-	GDestroyNotify _tmp3_ = NULL;
-	SpitPublishingProgressCallback _tmp4_ = NULL;
-	PublishingYandexPublishOptions* _tmp5_ = NULL;
-	GeeHashMap* _tmp6_ = NULL;
-	PublishingYandexPublishOptions* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gpointer _tmp9_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	void* _tmp2_;
+	GDestroyNotify _tmp3_;
+	SpitPublishingProgressCallback _tmp4_;
+	PublishingYandexPublishOptions* _tmp5_;
+	GeeHashMap* _tmp6_;
+	PublishingYandexPublishOptions* _tmp7_;
+	const gchar* _tmp8_;
+	gpointer _tmp9_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp10_;
+	gint _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	PublishingYandexUploader* uploader = NULL;
-	PublishingYandexSession* _tmp13_ = NULL;
-	PublishingYandexPublishOptions* _tmp14_ = NULL;
-	PublishingYandexUploader* _tmp15_ = NULL;
+	PublishingYandexSession* _tmp13_;
+	PublishingYandexPublishOptions* _tmp14_;
+	PublishingYandexUploader* _tmp15_;
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3830,13 +3836,13 @@ 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 3832 "YandexPublishing.c"
+#line 3838 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	PublishingYandexSession* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	PublishingYandexSession* _tmp1_;
 #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"
@@ -3845,7 +3851,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
 	if (!_tmp0_) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3847 "YandexPublishing.c"
+#line 3853 "YandexPublishing.c"
 	}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->session;
@@ -3857,24 +3863,24 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
 	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 3859 "YandexPublishing.c"
+#line 3865 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self) {
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	PublishingYandexPublishOptions* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GeeHashMap* _tmp7_ = NULL;
-	PublishingYandexPublishOptions* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gpointer _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	PublishingYandexPublishOptions* _tmp0_;
+	const gchar* _tmp1_;
+	GeeHashMap* _tmp2_;
+	PublishingYandexPublishOptions* _tmp3_;
+	const gchar* _tmp4_;
+	gpointer _tmp5_;
+	gchar* _tmp6_;
+	GeeHashMap* _tmp7_;
+	PublishingYandexPublishOptions* _tmp8_;
+	const gchar* _tmp9_;
+	gpointer _tmp10_;
+	gchar* _tmp11_;
+	gboolean _tmp12_;
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3913,11 +3919,11 @@ 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 3915 "YandexPublishing.c"
+#line 3921 "YandexPublishing.c"
 	} else {
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3919 "YandexPublishing.c"
+#line 3925 "YandexPublishing.c"
 	}
 }
 
@@ -3925,24 +3931,24 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
 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 3927 "YandexPublishing.c"
+#line 3933 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 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 3934 "YandexPublishing.c"
+#line 3940 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #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"
@@ -3967,38 +3973,38 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing
 	_tmp5_ = _tmp4_->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 3969 "YandexPublishing.c"
+#line 3975 "YandexPublishing.c"
 }
 
 
 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 3976 "YandexPublishing.c"
+#line 3982 "YandexPublishing.c"
 }
 
 
 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 3983 "YandexPublishing.c"
+#line 3989 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	PublishingYandexPublishingOptionsPane* publishing_options_pane = NULL;
-	PublishingYandexPublishOptions* _tmp12_ = NULL;
-	GeeHashMap* _tmp13_ = NULL;
-	SpitPublishingPluginHost* _tmp14_ = NULL;
-	PublishingYandexPublishingOptionsPane* _tmp15_ = NULL;
-	SpitPublishingPluginHost* _tmp16_ = NULL;
+	PublishingYandexPublishOptions* _tmp12_;
+	GeeHashMap* _tmp13_;
+	SpitPublishingPluginHost* _tmp14_;
+	PublishingYandexPublishingOptionsPane* _tmp15_;
+	SpitPublishingPluginHost* _tmp16_;
 	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));
@@ -4026,11 +4032,11 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 	g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4028 "YandexPublishing.c"
+#line 4034 "YandexPublishing.c"
 	{
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = t;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4045,7 +4051,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		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 4047 "YandexPublishing.c"
+#line 4053 "YandexPublishing.c"
 				goto __catch44_spit_publishing_publishing_error;
 			}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4054,15 +4060,15 @@ 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 4056 "YandexPublishing.c"
+#line 4062 "YandexPublishing.c"
 		}
 	}
 	goto __finally44;
 	__catch44_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
+		SpitPublishingPluginHost* _tmp10_;
+		GError* _tmp11_;
 #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"
@@ -4075,7 +4081,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4077 "YandexPublishing.c"
+#line 4083 "YandexPublishing.c"
 	}
 	__finally44:
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4086,7 +4092,7 @@ 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 4088 "YandexPublishing.c"
+#line 4094 "YandexPublishing.c"
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = self->priv->options;
@@ -4108,17 +4114,17 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (publishing_options_pane);
-#line 4110 "YandexPublishing.c"
+#line 4116 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self, const gchar* url) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	PublishingYandexTransaction* _tmp4_ = NULL;
+	PublishingYandexSession* _tmp2_;
+	const gchar* _tmp3_;
+	PublishingYandexTransaction* _tmp4_;
 	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));
@@ -4144,7 +4150,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 	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 4146 "YandexPublishing.c"
+#line 4152 "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_);
@@ -4152,7 +4158,7 @@ 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 4154 "YandexPublishing.c"
+#line 4160 "YandexPublishing.c"
 				goto __catch45_spit_publishing_publishing_error;
 			}
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4163,15 +4169,15 @@ 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 4165 "YandexPublishing.c"
+#line 4171 "YandexPublishing.c"
 		}
 	}
 	goto __finally45;
 	__catch45_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
+		SpitPublishingPluginHost* _tmp5_;
+		GError* _tmp6_;
 #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"
@@ -4184,7 +4190,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4186 "YandexPublishing.c"
+#line 4192 "YandexPublishing.c"
 	}
 	__finally45:
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4197,35 +4203,35 @@ 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 4199 "YandexPublishing.c"
+#line 4205 "YandexPublishing.c"
 	}
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4203 "YandexPublishing.c"
+#line 4209 "YandexPublishing.c"
 }
 
 
 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 4210 "YandexPublishing.c"
+#line 4216 "YandexPublishing.c"
 }
 
 
 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 4217 "YandexPublishing.c"
+#line 4223 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #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"
@@ -4248,18 +4254,18 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan
 	_tmp5_ = _tmp4_->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 4250 "YandexPublishing.c"
+#line 4256 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	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));
@@ -4287,17 +4293,17 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 	g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4289 "YandexPublishing.c"
+#line 4295 "YandexPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp11_;
 		xmlNode* root = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = t;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4316,7 +4322,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		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 4318 "YandexPublishing.c"
+#line 4324 "YandexPublishing.c"
 				goto __catch46_spit_publishing_publishing_error;
 			}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4325,7 +4331,7 @@ 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 4327 "YandexPublishing.c"
+#line 4333 "YandexPublishing.c"
 		}
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp12_ = doc;
@@ -4333,40 +4339,40 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		root = _tmp13_;
-#line 4335 "YandexPublishing.c"
+#line 4341 "YandexPublishing.c"
 		{
 			xmlNode* work = NULL;
-			xmlNode* _tmp14_ = NULL;
-			xmlNode* _tmp15_ = NULL;
+			xmlNode* _tmp14_;
+			xmlNode* _tmp15_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp14_ = root;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp15_ = _tmp14_->children;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			work = _tmp15_;
-#line 4346 "YandexPublishing.c"
+#line 4352 "YandexPublishing.c"
 			{
 				gboolean _tmp16_ = FALSE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp16_ = TRUE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				while (TRUE) {
-#line 4353 "YandexPublishing.c"
-					xmlNode* _tmp19_ = NULL;
-					xmlNode* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
+#line 4359 "YandexPublishing.c"
+					xmlNode* _tmp19_;
+					xmlNode* _tmp20_;
+					const gchar* _tmp21_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					if (!_tmp16_) {
-#line 4359 "YandexPublishing.c"
-						xmlNode* _tmp17_ = NULL;
-						xmlNode* _tmp18_ = NULL;
+#line 4365 "YandexPublishing.c"
+						xmlNode* _tmp17_;
+						xmlNode* _tmp18_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp17_ = work;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp18_ = _tmp17_->next;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						work = _tmp18_;
-#line 4368 "YandexPublishing.c"
+#line 4374 "YandexPublishing.c"
 					}
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = FALSE;
@@ -4376,7 +4382,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 					if (!(_tmp19_ != NULL)) {
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						break;
-#line 4378 "YandexPublishing.c"
+#line 4384 "YandexPublishing.c"
 					}
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = work;
@@ -4386,45 +4392,45 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 					if (g_strcmp0 (_tmp21_, "workspace") != 0) {
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						continue;
-#line 4388 "YandexPublishing.c"
+#line 4394 "YandexPublishing.c"
 					}
 					{
 						xmlNode* c = NULL;
-						xmlNode* _tmp22_ = NULL;
-						xmlNode* _tmp23_ = NULL;
+						xmlNode* _tmp22_;
+						xmlNode* _tmp23_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp22_ = work;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp23_ = _tmp22_->children;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						c = _tmp23_;
-#line 4400 "YandexPublishing.c"
+#line 4406 "YandexPublishing.c"
 						{
 							gboolean _tmp24_ = FALSE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							_tmp24_ = TRUE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							while (TRUE) {
-#line 4407 "YandexPublishing.c"
-								xmlNode* _tmp27_ = NULL;
-								xmlNode* _tmp28_ = NULL;
-								const gchar* _tmp29_ = NULL;
-								xmlNode* _tmp30_ = NULL;
-								gchar* _tmp31_ = NULL;
-								gchar* _tmp32_ = NULL;
-								gboolean _tmp33_ = FALSE;
+#line 4413 "YandexPublishing.c"
+								xmlNode* _tmp27_;
+								xmlNode* _tmp28_;
+								const gchar* _tmp29_;
+								xmlNode* _tmp30_;
+								gchar* _tmp31_;
+								gchar* _tmp32_;
+								gboolean _tmp33_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (!_tmp24_) {
-#line 4417 "YandexPublishing.c"
-									xmlNode* _tmp25_ = NULL;
-									xmlNode* _tmp26_ = NULL;
+#line 4423 "YandexPublishing.c"
+									xmlNode* _tmp25_;
+									xmlNode* _tmp26_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp25_ = c;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp26_ = _tmp25_->next;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									c = _tmp26_;
-#line 4426 "YandexPublishing.c"
+#line 4432 "YandexPublishing.c"
 								}
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp24_ = FALSE;
@@ -4434,7 +4440,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								if (!(_tmp27_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4436 "YandexPublishing.c"
+#line 4442 "YandexPublishing.c"
 								}
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp28_ = c;
@@ -4444,7 +4450,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								if (g_strcmp0 (_tmp29_, "collection") != 0) {
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									continue;
-#line 4446 "YandexPublishing.c"
+#line 4452 "YandexPublishing.c"
 								}
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp30_ = c;
@@ -4458,14 +4464,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								_g_free0 (_tmp32_);
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (_tmp33_) {
-#line 4460 "YandexPublishing.c"
+#line 4466 "YandexPublishing.c"
 									gchar* url = NULL;
-									xmlNode* _tmp34_ = NULL;
-									gchar* _tmp35_ = NULL;
-									PublishingYandexSession* _tmp36_ = NULL;
-									gchar* _tmp37_ = NULL;
-									gchar* _tmp38_ = NULL;
-									const gchar* _tmp39_ = NULL;
+									xmlNode* _tmp34_;
+									gchar* _tmp35_;
+									PublishingYandexSession* _tmp36_;
+									gchar* _tmp37_;
+									gchar* _tmp38_;
+									const gchar* _tmp39_;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp34_ = c;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4490,7 +4496,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 									_g_free0 (url);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4492 "YandexPublishing.c"
+#line 4498 "YandexPublishing.c"
 								}
 							}
 						}
@@ -4500,14 +4506,14 @@ 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 4502 "YandexPublishing.c"
+#line 4508 "YandexPublishing.c"
 	}
 	goto __finally46;
 	__catch46_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp40_ = NULL;
-		GError* _tmp41_ = NULL;
+		SpitPublishingPluginHost* _tmp40_;
+		GError* _tmp41_;
 #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"
@@ -4520,7 +4526,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4522 "YandexPublishing.c"
+#line 4528 "YandexPublishing.c"
 	}
 	__finally46:
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4531,17 +4537,17 @@ 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 4533 "YandexPublishing.c"
+#line 4539 "YandexPublishing.c"
 	}
 }
 
 
 void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
-	PublishingYandexSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingYandexSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp2_ = NULL;
-	PublishingYandexTransaction* _tmp3_ = NULL;
+	PublishingYandexSession* _tmp2_;
+	PublishingYandexTransaction* _tmp3_;
 	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));
@@ -4563,7 +4569,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 	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 4565 "YandexPublishing.c"
+#line 4571 "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_);
@@ -4571,7 +4577,7 @@ 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 4573 "YandexPublishing.c"
+#line 4579 "YandexPublishing.c"
 				goto __catch47_spit_publishing_publishing_error;
 			}
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4582,15 +4588,15 @@ 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 4584 "YandexPublishing.c"
+#line 4590 "YandexPublishing.c"
 		}
 	}
 	goto __finally47;
 	__catch47_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #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"
@@ -4603,7 +4609,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4605 "YandexPublishing.c"
+#line 4611 "YandexPublishing.c"
 	}
 	__finally47:
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4616,19 +4622,19 @@ 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 4618 "YandexPublishing.c"
+#line 4624 "YandexPublishing.c"
 	}
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4622 "YandexPublishing.c"
+#line 4628 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self, const gchar* access_token) {
-	const gchar* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _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"
@@ -4649,7 +4655,7 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish
 	_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 4651 "YandexPublishing.c"
+#line 4657 "YandexPublishing.c"
 }
 
 
@@ -4658,33 +4664,33 @@ static void publishing_yandex_yandex_publisher_web_auth_login_failed (Publishing
 	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 4660 "YandexPublishing.c"
+#line 4666 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4667 "YandexPublishing.c"
+#line 4673 "YandexPublishing.c"
 }
 
 
 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 4674 "YandexPublishing.c"
+#line 4680 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingYandexWebAuthPane* _tmp3_ = NULL;
-	PublishingYandexWebAuthPane* _tmp4_ = NULL;
-	PublishingYandexWebAuthPane* _tmp5_ = NULL;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	PublishingYandexWebAuthPane* _tmp7_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingYandexWebAuthPane* _tmp3_;
+	PublishingYandexWebAuthPane* _tmp4_;
+	PublishingYandexWebAuthPane* _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+	PublishingYandexWebAuthPane* _tmp7_;
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4717,37 +4723,34 @@ 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 4719 "YandexPublishing.c"
+#line 4725 "YandexPublishing.c"
 }
 
 
 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 4726 "YandexPublishing.c"
+#line 4732 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = _ ("You are not currently logged into Yandex.Fotki.");
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 4741 "YandexPublishing.c"
+	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"
 }
 
 
 static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingYandexYandexPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	gboolean _tmp2_;
 #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"
@@ -4756,7 +4759,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4758 "YandexPublishing.c"
+#line 4761 "YandexPublishing.c"
 	}
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->host;
@@ -4765,7 +4768,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 #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 4766 "YandexPublishing.c"
+#line 4769 "YandexPublishing.c"
 	}
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
@@ -4775,12 +4778,12 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 	_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 4776 "YandexPublishing.c"
-		PublishingYandexSession* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 4779 "YandexPublishing.c"
+		PublishingYandexSession* _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;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4799,11 +4802,11 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 		publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 4800 "YandexPublishing.c"
+#line 4803 "YandexPublishing.c"
 	} else {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 4804 "YandexPublishing.c"
+#line 4807 "YandexPublishing.c"
 	}
 }
 
@@ -4818,7 +4821,7 @@ 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 4819 "YandexPublishing.c"
+#line 4822 "YandexPublishing.c"
 }
 
 
@@ -4829,7 +4832,7 @@ static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYande
 	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 4830 "YandexPublishing.c"
+#line 4833 "YandexPublishing.c"
 }
 
 
@@ -4837,14 +4840,14 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa
 #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"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_is_running;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_get_service;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start;
+	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 4845 "YandexPublishing.c"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_stop;
+#line 4848 "YandexPublishing.c"
 }
 
 
@@ -4855,6 +4858,10 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa
 	self->priv->host = NULL;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter = NULL;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->service = NULL;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4865,11 +4872,11 @@ 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 4866 "YandexPublishing.c"
+#line 4873 "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);
@@ -4893,7 +4900,7 @@ 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 4894 "YandexPublishing.c"
+#line 4901 "YandexPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
index eb4ec9e..04cf9d3 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.34.7, the Vala compiler
+/* shotwell-publishing-extras.c generated by valac 0.36.6, the Vala compiler
  * generated from shotwell-publishing-extras.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -85,7 +85,7 @@ struct _ShotwellPublishingExtraServicesPrivate {
 
 
 static gpointer shotwell_publishing_extra_services_parent_class = NULL;
-static SpitModuleIface* shotwell_publishing_extra_services_spit_module_parent_iface = NULL;
+static SpitModuleIface * shotwell_publishing_extra_services_spit_module_parent_iface = NULL;
 
 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))
@@ -97,30 +97,30 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (G
 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);
+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);
+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);
+static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 Gallery3Service* gallery3_service_new (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_add17 (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 void shotwell_publishing_extra_services_finalize (GObject* obj);
+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) {
+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"
@@ -137,7 +137,7 @@ static void _vala_array_add14 (SpitPluggable*** array, int* length, int* size, S
 }
 
 
-static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+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"
@@ -154,7 +154,7 @@ static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, S
 }
 
 
-static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add16 (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"
@@ -171,7 +171,7 @@ static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, S
 }
 
 
-static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+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"
@@ -190,27 +190,27 @@ static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, S
 
 ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file) {
 	ShotwellPublishingExtraServices * self = NULL;
-	SpitPluggable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	YandexService* _tmp1_ = NULL;
-	SpitPluggable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	TumblrService* _tmp6_ = NULL;
-	SpitPluggable** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	RajceService* _tmp11_ = NULL;
-	SpitPluggable** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
-	Gallery3Service* _tmp16_ = 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_;
 #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"
@@ -287,16 +287,13 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile*
 static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base) {
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #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 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp0_ = _ ("Shotwell Extra Publishing Services");
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	result = _tmp0_;
+	result = _ ("Shotwell Extra Publishing Services");
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 300 "shotwell-publishing-extras.c"
+#line 297 "shotwell-publishing-extras.c"
 }
 
 
@@ -309,7 +306,7 @@ static const gchar* shotwell_publishing_extra_services_real_get_version (SpitMod
 	result = _VERSION;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 313 "shotwell-publishing-extras.c"
+#line 310 "shotwell-publishing-extras.c"
 }
 
 
@@ -322,17 +319,17 @@ static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule*
 	result = "org.yorba.shotwell.publishing.extras";
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 326 "shotwell-publishing-extras.c"
+#line 323 "shotwell-publishing-extras.c"
 }
 
 
 static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1) {
 	ShotwellPublishingExtraServices * self;
 	SpitPluggable** result = NULL;
-	SpitPluggable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPluggable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitPluggable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPluggable** _tmp1_;
+	gint _tmp1__length1;
 #line 42 "/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"
@@ -347,13 +344,13 @@ static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (S
 	if (result_length1) {
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*result_length1 = _tmp1__length1;
-#line 351 "shotwell-publishing-extras.c"
+#line 348 "shotwell-publishing-extras.c"
 	}
 #line 43 "/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"
 	return result;
-#line 357 "shotwell-publishing-extras.c"
+#line 354 "shotwell-publishing-extras.c"
 }
 
 
@@ -364,7 +361,7 @@ static void shotwell_publishing_extra_services_class_init (ShotwellPublishingExt
 	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 368 "shotwell-publishing-extras.c"
+#line 365 "shotwell-publishing-extras.c"
 }
 
 
@@ -372,19 +369,19 @@ static void shotwell_publishing_extra_services_spit_module_interface_init (SpitM
 #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"
-	iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_module_name;
+	iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_module_name;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_version;
+	iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_version;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_id;
+	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 383 "shotwell-publishing-extras.c"
+	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_extra_services_real_get_pluggables;
+#line 380 "shotwell-publishing-extras.c"
 }
 
 
 static void shotwell_publishing_extra_services_instance_init (ShotwellPublishingExtraServices * self) {
-	SpitPluggable** _tmp0_ = NULL;
+	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);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -395,11 +392,11 @@ 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 399 "shotwell-publishing-extras.c"
+#line 396 "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);
@@ -407,7 +404,7 @@ 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 411 "shotwell-publishing-extras.c"
+#line 408 "shotwell-publishing-extras.c"
 }
 
 
@@ -427,14 +424,14 @@ GType shotwell_publishing_extra_services_get_type (void) {
 
 SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	SpitModule* result = NULL;
-	SpitEntryPointParams* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	SpitEntryPointParams* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	SpitEntryPointParams* _tmp0_;
+	gint _tmp1_;
+	SpitEntryPointParams* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	ShotwellPublishingExtraServices* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	SpitEntryPointParams* _tmp6_;
+	gint _tmp7_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0_ = params;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -453,10 +450,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	_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 457 "shotwell-publishing-extras.c"
-		SpitEntryPointParams* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		ShotwellPublishingExtraServices* _tmp10_ = NULL;
+#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"
@@ -467,19 +464,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 		_g_object_unref0 (_tmp5_);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp5_ = _tmp10_;
-#line 471 "shotwell-publishing-extras.c"
+#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 477 "shotwell-publishing-extras.c"
+#line 474 "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"
 	return result;
-#line 483 "shotwell-publishing-extras.c"
+#line 480 "shotwell-publishing-extras.c"
 }