Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 1978 insertions, 2014 deletions

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"
 }