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

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-12-15 20:38:57 +0100
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-12-15 20:38:57 +0100
commit: f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
tree: a1f2ab30332a6383b0677bfcc2aec687b98851d6 /plugins/shotwell-publishing
parent: f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parent: ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
6 files changed, 8549 insertions, 8647 deletions
diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index a16729e..a1d00b4 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -1,4 +1,4 @@
-/* FacebookPublishing.c generated by valac 0.34.7, the Vala compiler
+/* FacebookPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from FacebookPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -140,10 +140,23 @@ typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass P
 typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate;
 #define _publishing_facebook_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_publishing_options_pane_privacy_description_unref (var), NULL)))
 typedef struct _PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescription PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescription;
+enum  {
+	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_FACEBOOK_TYPE_ENDPOINT (publishing_facebook_endpoint_get_type ())
 typedef struct _PublishingFacebookGraphMessagePrivate PublishingFacebookGraphMessagePrivate;
 typedef struct _PublishingFacebookParamSpecGraphMessage PublishingFacebookParamSpecGraphMessage;
+enum  {
+	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL,
+	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL,
+	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL,
+	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL
+};
+static guint publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL] = {0};
 typedef struct _PublishingFacebookGraphSessionPrivate PublishingFacebookGraphSessionPrivate;
 
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL (publishing_facebook_graph_session_graph_message_impl_get_type ())
@@ -207,8 +220,19 @@ typedef struct _PublishingFacebookGraphSessionGraphUploadMessagePrivate Publishi
 #define __vala_SoupBuffer_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupBuffer_free (var), NULL)))
 typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessagePrivate PublishingFacebookGraphSessionGraphCreateAlbumMessagePrivate;
 typedef struct _PublishingFacebookParamSpecGraphSession PublishingFacebookParamSpecGraphSession;
+enum  {
+	PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL,
+	PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL
+};
+static guint publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL] = {0};
 typedef struct _PublishingFacebookUploaderPrivate PublishingFacebookUploaderPrivate;
 typedef struct _PublishingFacebookParamSpecUploader PublishingFacebookParamSpecUploader;
+enum  {
+	PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL,
+	PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL,
+	PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL
+};
+static guint publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -479,15 +503,15 @@ static gint facebook_service_icon_pixbuf_set_length1;
 static GdkPixbuf** facebook_service_icon_pixbuf_set = NULL;
 static gint facebook_service_icon_pixbuf_set_length1 = 0;
 static gint _facebook_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* facebook_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* facebook_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * facebook_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * facebook_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_facebook_album_parent_class = NULL;
 static gpointer publishing_facebook_publishing_parameters_parent_class = NULL;
 static gpointer publishing_facebook_facebook_publisher_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = NULL;
 static gpointer publishing_facebook_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_facebook_graph_message_parent_class = NULL;
 static gpointer publishing_facebook_graph_session_parent_class = NULL;
 static gpointer publishing_facebook_graph_session_graph_message_impl_parent_class = NULL;
@@ -515,7 +539,7 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new
 PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
 GType publishing_facebook_facebook_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType facebook_service_real_get_supported_media (SpitPublishingService* base);
-static void facebook_service_finalize (GObject* obj);
+static void facebook_service_finalize (GObject * obj);
 #define PUBLISHING_FACEBOOK_SERVICE_NAME "facebook"
 #define PUBLISHING_FACEBOOK_USER_VISIBLE_NAME "Facebook"
 #define PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
@@ -532,7 +556,7 @@ enum  {
 };
 PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id);
 PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id);
-static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj);
+static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj);
 GType publishing_facebook_resolution_get_type (void) G_GNUC_CONST;
 gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self);
 const gchar* publishing_facebook_resolution_to_string (PublishingFacebookResolution self);
@@ -551,11 +575,11 @@ enum  {
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void);
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type);
 void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id);
-static void _vala_array_add6 (PublishingFacebookAlbum*** array, int* length, int* size, PublishingFacebookAlbum* value);
+static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value);
 void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name);
 gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self);
 gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self);
-static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj);
+static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj);
 gpointer publishing_facebook_graph_session_ref (gpointer instance);
 void publishing_facebook_graph_session_unref (gpointer instance);
 GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -650,7 +674,7 @@ static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit
 static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base);
 void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self);
 static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base);
-static void publishing_facebook_facebook_publisher_finalize (GObject* obj);
+static void publishing_facebook_facebook_publisher_finalize (GObject * obj);
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance);
 static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance);
 static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -685,11 +709,11 @@ static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_com
 static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self);
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting);
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting);
-static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add10 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value);
-static void _vala_array_add11 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value);
+static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
+static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
 void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self);
 static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self);
 static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution);
@@ -703,8 +727,8 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure *
 enum  {
 	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY
 };
-static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription* obj);
-static void publishing_facebook_publishing_options_pane_finalize (GObject* obj);
+static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj);
+static void publishing_facebook_publishing_options_pane_finalize (GObject * obj);
 GType publishing_facebook_endpoint_get_type (void) G_GNUC_CONST;
 gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self);
 enum  {
@@ -715,7 +739,7 @@ static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebook
 static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self);
 PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type);
 static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage* obj);
+static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj);
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSessionPrivate))
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_DUMMY_PROPERTY
@@ -745,7 +769,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self);
 static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base);
 static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base);
-static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage* obj);
+static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj);
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE_DUMMY_PROPERTY
 };
@@ -763,11 +787,11 @@ enum  {
 static void _vala_SoupMultipart_free (SoupMultipart* self);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base);
-static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage* obj);
+static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj);
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_CREATE_ALBUM_MESSAGE_DUMMY_PROPERTY
 };
-static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession* obj);
+static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj);
 #define PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploaderPrivate))
 enum  {
 	PUBLISHING_FACEBOOK_UPLOADER_DUMMY_PROPERTY
@@ -781,15 +805,15 @@ static void _publishing_facebook_uploader_on_message_completed_publishing_facebo
 static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_);
 static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
 static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self);
-static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj);
+static void publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory) {
 	FacebookService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -800,9 +824,9 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
 	_tmp0__length1 = facebook_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 804 "FacebookPublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 828 "FacebookPublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" FACEBOOK_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -813,27 +837,27 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
 		facebook_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_facebook_service_icon_pixbuf_set_size_ = facebook_service_icon_pixbuf_set_length1;
-#line 817 "FacebookPublishing.c"
+#line 841 "FacebookPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 821 "FacebookPublishing.c"
+#line 845 "FacebookPublishing.c"
 }
 
 
 FacebookService* facebook_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return facebook_service_construct (TYPE_FACEBOOK_SERVICE, resource_directory);
-#line 828 "FacebookPublishing.c"
+#line 852 "FacebookPublishing.c"
 }
 
 
 static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	FacebookService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -846,7 +870,7 @@ static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 850 "FacebookPublishing.c"
+#line 874 "FacebookPublishing.c"
 }
 
 
@@ -859,7 +883,7 @@ static const gchar* facebook_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.facebook";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 863 "FacebookPublishing.c"
+#line 887 "FacebookPublishing.c"
 }
 
 
@@ -872,14 +896,14 @@ static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "Facebook";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 876 "FacebookPublishing.c"
+#line 900 "FacebookPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 883 "FacebookPublishing.c"
+#line 907 "FacebookPublishing.c"
 }
 
 
@@ -890,34 +914,33 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 894 "FacebookPublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 918 "FacebookPublishing.c"
+		GdkPixbuf* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 900 "FacebookPublishing.c"
+#line 924 "FacebookPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 904 "FacebookPublishing.c"
+#line 928 "FacebookPublishing.c"
 }
 
 
 static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	FacebookService * 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 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -929,60 +952,58 @@ static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*info).authors = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc.");
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 ((*info).translators);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 ((*info).version);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 ((*info).license);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = facebook_service_icon_pixbuf_set;
+	_tmp7_ = facebook_service_icon_pixbuf_set;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8__length1 = facebook_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = facebook_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 986 "FacebookPublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 1007 "FacebookPublishing.c"
 }
 
 
@@ -990,15 +1011,15 @@ static void facebook_service_real_activation (SpitPluggable* base, gboolean enab
 	FacebookService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
-#line 994 "FacebookPublishing.c"
+#line 1015 "FacebookPublishing.c"
 }
 
 
 static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	FacebookService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingFacebookFacebookPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingFacebookFacebookPublisher* _tmp1_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1011,7 +1032,7 @@ static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1015 "FacebookPublishing.c"
+#line 1036 "FacebookPublishing.c"
 }
 
 
@@ -1024,7 +1045,7 @@ static SpitPublishingPublisherMediaType facebook_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1028 "FacebookPublishing.c"
+#line 1049 "FacebookPublishing.c"
 }
 
 
@@ -1033,7 +1054,7 @@ static void facebook_service_class_init (FacebookServiceClass * klass) {
 	facebook_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = facebook_service_finalize;
-#line 1037 "FacebookPublishing.c"
+#line 1058 "FacebookPublishing.c"
 }
 
 
@@ -1041,16 +1062,16 @@ static void facebook_service_spit_pluggable_interface_init (SpitPluggableIface *
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	facebook_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) facebook_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) facebook_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) facebook_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) facebook_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) facebook_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) facebook_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) facebook_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) facebook_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) facebook_service_real_activation;
-#line 1054 "FacebookPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) facebook_service_real_activation;
+#line 1075 "FacebookPublishing.c"
 }
 
 
@@ -1058,10 +1079,10 @@ static void facebook_service_spit_publishing_service_interface_init (SpitPublish
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	facebook_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) facebook_service_real_create_publisher;
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) facebook_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) facebook_service_real_get_supported_media;
-#line 1065 "FacebookPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) facebook_service_real_get_supported_media;
+#line 1086 "FacebookPublishing.c"
 }
 
 
@@ -1069,13 +1090,13 @@ static void facebook_service_instance_init (FacebookService * self) {
 }
 
 
-static void facebook_service_finalize (GObject* obj) {
+static void facebook_service_finalize (GObject * obj) {
 	FacebookService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (facebook_service_parent_class)->finalize (obj);
-#line 1079 "FacebookPublishing.c"
+#line 1100 "FacebookPublishing.c"
 }
 
 
@@ -1097,10 +1118,10 @@ GType facebook_service_get_type (void) {
 
 PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id) {
 	PublishingFacebookAlbum* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1125,21 +1146,21 @@ PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
 	self->id = _tmp3_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1129 "FacebookPublishing.c"
+#line 1150 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_album_construct (PUBLISHING_FACEBOOK_TYPE_ALBUM, name, id);
-#line 1136 "FacebookPublishing.c"
+#line 1157 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_album_init (GValue* value) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1143 "FacebookPublishing.c"
+#line 1164 "FacebookPublishing.c"
 }
 
 
@@ -1148,7 +1169,7 @@ static void publishing_facebook_value_album_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (value->data[0].v_pointer);
-#line 1152 "FacebookPublishing.c"
+#line 1173 "FacebookPublishing.c"
 	}
 }
 
@@ -1158,11 +1179,11 @@ static void publishing_facebook_value_album_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_album_ref (src_value->data[0].v_pointer);
-#line 1162 "FacebookPublishing.c"
+#line 1183 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1166 "FacebookPublishing.c"
+#line 1187 "FacebookPublishing.c"
 	}
 }
 
@@ -1170,66 +1191,66 @@ static void publishing_facebook_value_album_copy_value (const GValue* src_value,
 static gpointer publishing_facebook_value_album_peek_pointer (const GValue* value) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1174 "FacebookPublishing.c"
+#line 1195 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1181 "FacebookPublishing.c"
-		PublishingFacebookAlbum* object;
+#line 1202 "FacebookPublishing.c"
+		PublishingFacebookAlbum * object;
 		object = collect_values[0].v_pointer;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1188 "FacebookPublishing.c"
+#line 1209 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1192 "FacebookPublishing.c"
+#line 1213 "FacebookPublishing.c"
 		}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_album_ref (object);
-#line 1196 "FacebookPublishing.c"
+#line 1217 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1200 "FacebookPublishing.c"
+#line 1221 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1204 "FacebookPublishing.c"
+#line 1225 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFacebookAlbum** object_p;
+	PublishingFacebookAlbum ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1215 "FacebookPublishing.c"
+#line 1236 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 1221 "FacebookPublishing.c"
+#line 1242 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1225 "FacebookPublishing.c"
+#line 1246 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1229 "FacebookPublishing.c"
+#line 1250 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1233 "FacebookPublishing.c"
+#line 1254 "FacebookPublishing.c"
 }
 
 
@@ -1243,7 +1264,7 @@ GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1247 "FacebookPublishing.c"
+#line 1268 "FacebookPublishing.c"
 }
 
 
@@ -1252,12 +1273,12 @@ gpointer publishing_facebook_value_get_album (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1256 "FacebookPublishing.c"
+#line 1277 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
-	PublishingFacebookAlbum* old;
+	PublishingFacebookAlbum * old;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1272,23 +1293,23 @@ void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1276 "FacebookPublishing.c"
+#line 1297 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1280 "FacebookPublishing.c"
+#line 1301 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1286 "FacebookPublishing.c"
+#line 1307 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
-	PublishingFacebookAlbum* old;
+	PublishingFacebookAlbum * old;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1301,17 +1322,17 @@ void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1305 "FacebookPublishing.c"
+#line 1326 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1309 "FacebookPublishing.c"
+#line 1330 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1315 "FacebookPublishing.c"
+#line 1336 "FacebookPublishing.c"
 	}
 }
 
@@ -1321,18 +1342,18 @@ static void publishing_facebook_album_class_init (PublishingFacebookAlbumClass *
 	publishing_facebook_album_parent_class = g_type_class_peek_parent (klass);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookAlbumClass *) klass)->finalize = publishing_facebook_album_finalize;
-#line 1325 "FacebookPublishing.c"
+#line 1346 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_album_instance_init (PublishingFacebookAlbum * self) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 1332 "FacebookPublishing.c"
+#line 1353 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj) {
+static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj) {
 	PublishingFacebookAlbum * self;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_ALBUM, PublishingFacebookAlbum);
@@ -1342,7 +1363,7 @@ static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj) {
 	_g_free0 (self->name);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
-#line 1346 "FacebookPublishing.c"
+#line 1367 "FacebookPublishing.c"
 }
 
 
@@ -1361,18 +1382,18 @@ GType publishing_facebook_album_get_type (void) {
 
 
 gpointer publishing_facebook_album_ref (gpointer instance) {
-	PublishingFacebookAlbum* self;
+	PublishingFacebookAlbum * self;
 	self = instance;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 1371 "FacebookPublishing.c"
+#line 1392 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_album_unref (gpointer instance) {
-	PublishingFacebookAlbum* self;
+	PublishingFacebookAlbum * self;
 	self = instance;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1380,7 +1401,7 @@ void publishing_facebook_album_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_ALBUM_GET_CLASS (self)->finalize (self);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1384 "FacebookPublishing.c"
+#line 1405 "FacebookPublishing.c"
 	}
 }
 
@@ -1391,44 +1412,38 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 	switch (self) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1395 "FacebookPublishing.c"
+#line 1416 "FacebookPublishing.c"
 		{
-			const gchar* _tmp0_ = NULL;
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp0_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp0_ = _ ("Standard (720 pixels)");
+			_tmp0_ = g_strdup (_ ("Standard (720 pixels)"));
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp1_ = g_strdup (_tmp0_);
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			result = _tmp1_;
+			result = _tmp0_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1407 "FacebookPublishing.c"
+#line 1425 "FacebookPublishing.c"
 		}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1411 "FacebookPublishing.c"
+#line 1429 "FacebookPublishing.c"
 		{
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp2_ = _ ("Large (2048 pixels)");
+			gchar* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp3_ = g_strdup (_tmp2_);
+			_tmp1_ = g_strdup (_ ("Large (2048 pixels)"));
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			result = _tmp3_;
+			result = _tmp1_;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1423 "FacebookPublishing.c"
+#line 1438 "FacebookPublishing.c"
 		}
 		default:
 		{
-			GEnumValue* _tmp4_;
+			GEnumValue* _tmp2_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp4_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
+			_tmp2_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL);
-#line 1432 "FacebookPublishing.c"
+			g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL);
+#line 1447 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1440,23 +1455,23 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel
 	switch (self) {
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1444 "FacebookPublishing.c"
+#line 1459 "FacebookPublishing.c"
 		{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 720;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1450 "FacebookPublishing.c"
+#line 1465 "FacebookPublishing.c"
 		}
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1454 "FacebookPublishing.c"
+#line 1469 "FacebookPublishing.c"
 		{
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 2048;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1460 "FacebookPublishing.c"
+#line 1475 "FacebookPublishing.c"
 		}
 		default:
 		{
@@ -1465,7 +1480,7 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel
 			_tmp0_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_error ("FacebookPublishing.vala:100: Unknown resolution %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL);
-#line 1469 "FacebookPublishing.c"
+#line 1484 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1511,51 +1526,51 @@ PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameter
 	self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1515 "FacebookPublishing.c"
+#line 1530 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void) {
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_parameters_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS);
-#line 1522 "FacebookPublishing.c"
+#line 1537 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_album_ref0 (gpointer self) {
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_album_ref (self) : NULL;
-#line 1529 "FacebookPublishing.c"
+#line 1544 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add6 (PublishingFacebookAlbum*** array, int* length, int* size, PublishingFacebookAlbum* value) {
+static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value) {
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookAlbum*, *array, (*size) + 1);
-#line 1540 "FacebookPublishing.c"
+#line 1555 "FacebookPublishing.c"
 	}
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1546 "FacebookPublishing.c"
+#line 1561 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id) {
-	PublishingFacebookAlbum** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingFacebookAlbum** _tmp0_;
+	gint _tmp0__length1;
 	PublishingFacebookAlbum* new_album = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	PublishingFacebookAlbum* _tmp4_ = NULL;
-	PublishingFacebookAlbum** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	PublishingFacebookAlbum* _tmp6_ = NULL;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	PublishingFacebookAlbum* _tmp4_;
+	PublishingFacebookAlbum** _tmp5_;
+	gint _tmp5__length1;
+	PublishingFacebookAlbum* _tmp6_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1568,8 +1583,8 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 	_tmp0__length1 = self->albums_length1;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 1572 "FacebookPublishing.c"
-		PublishingFacebookAlbum** _tmp1_ = NULL;
+#line 1587 "FacebookPublishing.c"
+		PublishingFacebookAlbum** _tmp1_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1580,7 +1595,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 		self->albums_length1 = 0;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->_albums_size_ = self->albums_length1;
-#line 1584 "FacebookPublishing.c"
+#line 1599 "FacebookPublishing.c"
 	}
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = name;
@@ -1600,12 +1615,12 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 	_vala_array_add6 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_album_unref0 (new_album);
-#line 1604 "FacebookPublishing.c"
+#line 1619 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1616,38 +1631,38 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 		self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 1620 "FacebookPublishing.c"
+#line 1635 "FacebookPublishing.c"
 	}
 	{
 		gint i = 0;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		i = 0;
-#line 1626 "FacebookPublishing.c"
+#line 1641 "FacebookPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = TRUE;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			while (TRUE) {
-#line 1633 "FacebookPublishing.c"
-				gint _tmp3_ = 0;
-				PublishingFacebookAlbum** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				PublishingFacebookAlbum** _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				PublishingFacebookAlbum* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
+#line 1648 "FacebookPublishing.c"
+				gint _tmp3_;
+				PublishingFacebookAlbum** _tmp4_;
+				gint _tmp4__length1;
+				PublishingFacebookAlbum** _tmp5_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				PublishingFacebookAlbum* _tmp7_;
+				const gchar* _tmp8_;
+				const gchar* _tmp9_;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (!_tmp1_) {
-#line 1645 "FacebookPublishing.c"
-					gint _tmp2_ = 0;
+#line 1660 "FacebookPublishing.c"
+					gint _tmp2_;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp2_ = i;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					i = _tmp2_ + 1;
-#line 1651 "FacebookPublishing.c"
+#line 1666 "FacebookPublishing.c"
 				}
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = FALSE;
@@ -1661,7 +1676,7 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					break;
-#line 1665 "FacebookPublishing.c"
+#line 1680 "FacebookPublishing.c"
 				}
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp5_ = self->albums;
@@ -1677,36 +1692,36 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 				_tmp9_ = name;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1681 "FacebookPublishing.c"
-					gint _tmp10_ = 0;
+#line 1696 "FacebookPublishing.c"
+					gint _tmp10_;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp10_ = i;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					self->target_album = _tmp10_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					return;
-#line 1689 "FacebookPublishing.c"
+#line 1704 "FacebookPublishing.c"
 				}
 			}
 		}
 	}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1696 "FacebookPublishing.c"
+#line 1711 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	PublishingFacebookAlbum** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingFacebookAlbum** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gint _tmp4_ = 0;
-	PublishingFacebookAlbum* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	PublishingFacebookAlbum** _tmp1_;
+	gint _tmp1__length1;
+	PublishingFacebookAlbum** _tmp3_;
+	gint _tmp3__length1;
+	gint _tmp4_;
+	PublishingFacebookAlbum* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1717,14 +1732,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	if (_tmp1_ == NULL) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1721 "FacebookPublishing.c"
+#line 1736 "FacebookPublishing.c"
 	} else {
-		gint _tmp2_ = 0;
+		gint _tmp2_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1728 "FacebookPublishing.c"
+#line 1743 "FacebookPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
@@ -1732,7 +1747,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 		result = NULL;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1736 "FacebookPublishing.c"
+#line 1751 "FacebookPublishing.c"
 	}
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
@@ -1750,21 +1765,21 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	result = _tmp7_;
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1754 "FacebookPublishing.c"
+#line 1769 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	PublishingFacebookAlbum** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingFacebookAlbum** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gint _tmp4_ = 0;
-	PublishingFacebookAlbum* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	PublishingFacebookAlbum** _tmp1_;
+	gint _tmp1__length1;
+	PublishingFacebookAlbum** _tmp3_;
+	gint _tmp3__length1;
+	gint _tmp4_;
+	PublishingFacebookAlbum* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1775,14 +1790,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	if (_tmp1_ == NULL) {
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1779 "FacebookPublishing.c"
+#line 1794 "FacebookPublishing.c"
 	} else {
-		gint _tmp2_ = 0;
+		gint _tmp2_;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1786 "FacebookPublishing.c"
+#line 1801 "FacebookPublishing.c"
 	}
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
@@ -1790,7 +1805,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 		result = NULL;
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1794 "FacebookPublishing.c"
+#line 1809 "FacebookPublishing.c"
 	}
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
@@ -1808,14 +1823,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	result = _tmp7_;
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1812 "FacebookPublishing.c"
+#line 1827 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_publishing_parameters_init (GValue* value) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1819 "FacebookPublishing.c"
+#line 1834 "FacebookPublishing.c"
 }
 
 
@@ -1824,7 +1839,7 @@ static void publishing_facebook_value_publishing_parameters_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1828 "FacebookPublishing.c"
+#line 1843 "FacebookPublishing.c"
 	}
 }
 
@@ -1834,11 +1849,11 @@ static void publishing_facebook_value_publishing_parameters_copy_value (const GV
 	if (src_value->data[0].v_pointer) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1838 "FacebookPublishing.c"
+#line 1853 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1842 "FacebookPublishing.c"
+#line 1857 "FacebookPublishing.c"
 	}
 }
 
@@ -1846,66 +1861,66 @@ static void publishing_facebook_value_publishing_parameters_copy_value (const GV
 static gpointer publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1850 "FacebookPublishing.c"
+#line 1865 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1857 "FacebookPublishing.c"
-		PublishingFacebookPublishingParameters* object;
+#line 1872 "FacebookPublishing.c"
+		PublishingFacebookPublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1864 "FacebookPublishing.c"
+#line 1879 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1868 "FacebookPublishing.c"
+#line 1883 "FacebookPublishing.c"
 		}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (object);
-#line 1872 "FacebookPublishing.c"
+#line 1887 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1876 "FacebookPublishing.c"
+#line 1891 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1880 "FacebookPublishing.c"
+#line 1895 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFacebookPublishingParameters** object_p;
+	PublishingFacebookPublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1891 "FacebookPublishing.c"
+#line 1906 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 1897 "FacebookPublishing.c"
+#line 1912 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1901 "FacebookPublishing.c"
+#line 1916 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1905 "FacebookPublishing.c"
+#line 1920 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1909 "FacebookPublishing.c"
+#line 1924 "FacebookPublishing.c"
 }
 
 
@@ -1919,7 +1934,7 @@ GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1923 "FacebookPublishing.c"
+#line 1938 "FacebookPublishing.c"
 }
 
 
@@ -1928,12 +1943,12 @@ gpointer publishing_facebook_value_get_publishing_parameters (const GValue* valu
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1932 "FacebookPublishing.c"
+#line 1947 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingFacebookPublishingParameters* old;
+	PublishingFacebookPublishingParameters * old;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1948,23 +1963,23 @@ void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointe
 		value->data[0].v_pointer = v_object;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1952 "FacebookPublishing.c"
+#line 1967 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1956 "FacebookPublishing.c"
+#line 1971 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 1962 "FacebookPublishing.c"
+#line 1977 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingFacebookPublishingParameters* old;
+	PublishingFacebookPublishingParameters * old;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1977,17 +1992,17 @@ void publishing_facebook_value_take_publishing_parameters (GValue* value, gpoint
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1981 "FacebookPublishing.c"
+#line 1996 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1985 "FacebookPublishing.c"
+#line 2000 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 1991 "FacebookPublishing.c"
+#line 2006 "FacebookPublishing.c"
 	}
 }
 
@@ -1997,18 +2012,18 @@ static void publishing_facebook_publishing_parameters_class_init (PublishingFace
 	publishing_facebook_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingParametersClass *) klass)->finalize = publishing_facebook_publishing_parameters_finalize;
-#line 2001 "FacebookPublishing.c"
+#line 2016 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 2008 "FacebookPublishing.c"
+#line 2023 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj) {
+static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj) {
 	PublishingFacebookPublishingParameters * self;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS, PublishingFacebookPublishingParameters);
@@ -2020,7 +2035,7 @@ static void publishing_facebook_publishing_parameters_finalize (PublishingFacebo
 	_g_free0 (self->new_album_name);
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_object);
-#line 2024 "FacebookPublishing.c"
+#line 2039 "FacebookPublishing.c"
 }
 
 
@@ -2039,18 +2054,18 @@ GType publishing_facebook_publishing_parameters_get_type (void) {
 
 
 gpointer publishing_facebook_publishing_parameters_ref (gpointer instance) {
-	PublishingFacebookPublishingParameters* self;
+	PublishingFacebookPublishingParameters * self;
 	self = instance;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 2049 "FacebookPublishing.c"
+#line 2064 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_parameters_unref (gpointer instance) {
-	PublishingFacebookPublishingParameters* self;
+	PublishingFacebookPublishingParameters * self;
 	self = instance;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2058,7 +2073,7 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2062 "FacebookPublishing.c"
+#line 2077 "FacebookPublishing.c"
 	}
 }
 
@@ -2066,21 +2081,21 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) {
 static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self) {
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_session_authenticated ((PublishingFacebookFacebookPublisher*) self);
-#line 2070 "FacebookPublishing.c"
+#line 2085 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingFacebookFacebookPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp2_ = NULL;
-	PublishingAuthenticatorFactory* _tmp3_ = NULL;
-	PublishingAuthenticatorFactory* _tmp4_ = NULL;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	SpitPublishingAuthenticator* _tmp6_ = NULL;
-	PublishingFacebookGraphSession* _tmp7_ = NULL;
-	PublishingFacebookGraphSession* _tmp8_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingFacebookPublishingParameters* _tmp2_;
+	PublishingAuthenticatorFactory* _tmp3_;
+	PublishingAuthenticatorFactory* _tmp4_;
+	SpitPublishingPluginHost* _tmp5_;
+	SpitPublishingAuthenticator* _tmp6_;
+	PublishingFacebookGraphSession* _tmp7_;
+	PublishingFacebookGraphSession* _tmp8_;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2129,21 +2144,21 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_cons
 	g_signal_connect_object (_tmp8_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 2133 "FacebookPublishing.c"
+#line 2148 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_facebook_publisher_construct (PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, service, host);
-#line 2140 "FacebookPublishing.c"
+#line 2155 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE);
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2154,13 +2169,13 @@ static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_meta
 	result = _tmp1_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2158 "FacebookPublishing.c"
+#line 2173 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2169,14 +2184,14 @@ static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata
 	_tmp1_ = strip_metadata;
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 2173 "FacebookPublishing.c"
+#line 2188 "FacebookPublishing.c"
 }
 
 
 gint publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), 0);
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2187,13 +2202,13 @@ gint publishing_facebook_facebook_publisher_get_persistent_default_size (Publish
 	result = _tmp1_;
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2191 "FacebookPublishing.c"
+#line 2206 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2202,31 +2217,31 @@ void publishing_facebook_facebook_publisher_set_persistent_default_size (Publish
 	_tmp1_ = size;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 2206 "FacebookPublishing.c"
+#line 2221 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2213 "FacebookPublishing.c"
+#line 2228 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2220 "FacebookPublishing.c"
+#line 2235 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingFacebookGraphMessage* user_info_message = NULL;
-	PublishingFacebookGraphSession* _tmp2_ = NULL;
-	PublishingFacebookGraphMessage* _tmp3_ = NULL;
-	PublishingFacebookGraphSession* _tmp4_ = NULL;
+	PublishingFacebookGraphSession* _tmp2_;
+	PublishingFacebookGraphMessage* _tmp3_;
+	PublishingFacebookGraphSession* _tmp4_;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2255,35 +2270,35 @@ static void publishing_facebook_facebook_publisher_do_fetch_user_info (Publishin
 	publishing_facebook_graph_session_send_message (_tmp4_, user_info_message);
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (user_info_message);
-#line 2259 "FacebookPublishing.c"
+#line 2274 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2266 "FacebookPublishing.c"
+#line 2281 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2273 "FacebookPublishing.c"
+#line 2288 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingFacebookGraphMessage* albums_message = NULL;
-	PublishingFacebookGraphSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingFacebookGraphMessage* _tmp6_ = NULL;
-	PublishingFacebookGraphMessage* _tmp7_ = NULL;
-	PublishingFacebookGraphSession* _tmp8_ = NULL;
+	PublishingFacebookGraphSession* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingFacebookGraphMessage* _tmp6_;
+	PublishingFacebookGraphMessage* _tmp7_;
+	PublishingFacebookGraphSession* _tmp8_;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2322,35 +2337,35 @@ static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (
 	publishing_facebook_graph_session_send_message (_tmp8_, albums_message);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (albums_message);
-#line 2326 "FacebookPublishing.c"
+#line 2341 "FacebookPublishing.c"
 }
 
 
 static JsonNode* _vala_JsonNode_copy (JsonNode* self) {
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return g_boxed_copy (json_node_get_type (), self);
-#line 2333 "FacebookPublishing.c"
+#line 2348 "FacebookPublishing.c"
 }
 
 
 static gpointer __vala_JsonNode_copy0 (gpointer self) {
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? _vala_JsonNode_copy (self) : NULL;
-#line 2340 "FacebookPublishing.c"
+#line 2355 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 2347 "FacebookPublishing.c"
+#line 2362 "FacebookPublishing.c"
 }
 
 
 static void _vala_JsonNode_free (JsonNode* self) {
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (json_node_get_type (), self);
-#line 2354 "FacebookPublishing.c"
+#line 2369 "FacebookPublishing.c"
 }
 
 
@@ -2363,26 +2378,26 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:259: ACTION: extracting user info from JSON re" \
 "sponse.");
-#line 2366 "FacebookPublishing.c"
+#line 2381 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
-		JsonParser* _tmp0_ = NULL;
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		JsonParser* _tmp0_;
+		JsonParser* _tmp1_;
+		const gchar* _tmp2_;
 		JsonNode* root = NULL;
-		JsonParser* _tmp3_ = NULL;
-		JsonNode* _tmp4_ = NULL;
-		JsonNode* _tmp5_ = NULL;
+		JsonParser* _tmp3_;
+		JsonNode* _tmp4_;
+		JsonNode* _tmp5_;
 		JsonObject* response_object = NULL;
-		JsonNode* _tmp6_ = NULL;
-		JsonObject* _tmp7_ = NULL;
-		JsonObject* _tmp8_ = NULL;
-		JsonObject* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		JsonObject* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+		JsonNode* _tmp6_;
+		JsonObject* _tmp7_;
+		JsonObject* _tmp8_;
+		JsonObject* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		JsonObject* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2397,7 +2412,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2400 "FacebookPublishing.c"
+#line 2415 "FacebookPublishing.c"
 			goto __catch0_g_error;
 		}
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2442,17 +2457,17 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		__vala_JsonNode_free0 (root);
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2445 "FacebookPublishing.c"
+#line 2460 "FacebookPublishing.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
 	{
 		GError* _error_ = NULL;
-		SpitPublishingPluginHost* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
+		SpitPublishingPluginHost* _tmp15_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
+		GError* _tmp18_;
+		GError* _tmp19_;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2475,7 +2490,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		_g_error_free0 (_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2478 "FacebookPublishing.c"
+#line 2493 "FacebookPublishing.c"
 	}
 	__finally0:
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2486,18 +2501,18 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		g_clear_error (&_inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2489 "FacebookPublishing.c"
+#line 2504 "FacebookPublishing.c"
 	}
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_user_info_extracted (self);
-#line 2493 "FacebookPublishing.c"
+#line 2508 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_array_ref0 (gpointer self) {
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_array_ref (self) : NULL;
-#line 2500 "FacebookPublishing.c"
+#line 2515 "FacebookPublishing.c"
 }
 
 
@@ -2510,26 +2525,26 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:278: ACTION: extracting album info from JSON r" \
 "esponse.");
-#line 2512 "FacebookPublishing.c"
+#line 2527 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
-		JsonParser* _tmp0_ = NULL;
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		JsonParser* _tmp0_;
+		JsonParser* _tmp1_;
+		const gchar* _tmp2_;
 		JsonNode* root = NULL;
-		JsonParser* _tmp3_ = NULL;
-		JsonNode* _tmp4_ = NULL;
-		JsonNode* _tmp5_ = NULL;
+		JsonParser* _tmp3_;
+		JsonNode* _tmp4_;
+		JsonNode* _tmp5_;
 		JsonObject* response_object = NULL;
-		JsonNode* _tmp6_ = NULL;
-		JsonObject* _tmp7_ = NULL;
-		JsonObject* _tmp8_ = NULL;
+		JsonNode* _tmp6_;
+		JsonObject* _tmp7_;
+		JsonObject* _tmp8_;
 		JsonArray* album_list = NULL;
-		JsonObject* _tmp9_ = NULL;
-		JsonArray* _tmp10_ = NULL;
-		JsonArray* _tmp11_ = NULL;
-		PublishingFacebookPublishingParameters* _tmp12_ = NULL;
-		PublishingFacebookAlbum** _tmp13_ = NULL;
+		JsonObject* _tmp9_;
+		JsonArray* _tmp10_;
+		JsonArray* _tmp11_;
+		PublishingFacebookPublishingParameters* _tmp12_;
+		PublishingFacebookAlbum** _tmp13_;
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2544,7 +2559,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2546 "FacebookPublishing.c"
+#line 2561 "FacebookPublishing.c"
 			goto __catch1_g_error;
 		}
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2583,47 +2598,47 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		_tmp12_->albums_length1 = 0;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->_albums_size_ = _tmp12_->albums_length1;
-#line 2585 "FacebookPublishing.c"
+#line 2600 "FacebookPublishing.c"
 		{
 			gint i = 0;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			i = 0;
-#line 2590 "FacebookPublishing.c"
+#line 2605 "FacebookPublishing.c"
 			{
 				gboolean _tmp14_ = FALSE;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp14_ = TRUE;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				while (TRUE) {
-#line 2597 "FacebookPublishing.c"
-					gint _tmp16_ = 0;
-					JsonArray* _tmp17_ = NULL;
-					guint _tmp18_ = 0U;
+#line 2612 "FacebookPublishing.c"
+					gint _tmp16_;
+					JsonArray* _tmp17_;
+					guint _tmp18_;
 					JsonObject* current_album = NULL;
-					JsonArray* _tmp19_ = NULL;
-					gint _tmp20_ = 0;
-					JsonObject* _tmp21_ = NULL;
-					JsonObject* _tmp22_ = NULL;
+					JsonArray* _tmp19_;
+					gint _tmp20_;
+					JsonObject* _tmp21_;
+					JsonObject* _tmp22_;
 					gchar* album_id = NULL;
-					JsonObject* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gchar* _tmp25_ = NULL;
+					JsonObject* _tmp23_;
+					const gchar* _tmp24_;
+					gchar* _tmp25_;
 					gchar* album_name = NULL;
-					JsonObject* _tmp26_ = NULL;
-					const gchar* _tmp27_ = NULL;
-					gchar* _tmp28_ = NULL;
-					PublishingFacebookPublishingParameters* _tmp29_ = NULL;
-					const gchar* _tmp30_ = NULL;
-					const gchar* _tmp31_ = NULL;
+					JsonObject* _tmp26_;
+					const gchar* _tmp27_;
+					gchar* _tmp28_;
+					PublishingFacebookPublishingParameters* _tmp29_;
+					const gchar* _tmp30_;
+					const gchar* _tmp31_;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (!_tmp14_) {
-#line 2619 "FacebookPublishing.c"
-						gint _tmp15_ = 0;
+#line 2634 "FacebookPublishing.c"
+						gint _tmp15_;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp15_ = i;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						i = _tmp15_ + 1;
-#line 2625 "FacebookPublishing.c"
+#line 2640 "FacebookPublishing.c"
 					}
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp14_ = FALSE;
@@ -2637,7 +2652,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 					if (!(((guint) _tmp16_) < _tmp18_)) {
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						break;
-#line 2639 "FacebookPublishing.c"
+#line 2654 "FacebookPublishing.c"
 					}
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp19_ = album_list;
@@ -2679,7 +2694,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 					_g_free0 (album_id);
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_json_object_unref0 (current_album);
-#line 2681 "FacebookPublishing.c"
+#line 2696 "FacebookPublishing.c"
 				}
 			}
 		}
@@ -2691,17 +2706,17 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		__vala_JsonNode_free0 (root);
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2693 "FacebookPublishing.c"
+#line 2708 "FacebookPublishing.c"
 	}
 	goto __finally1;
 	__catch1_g_error:
 	{
 		GError* _error_ = NULL;
-		SpitPublishingPluginHost* _tmp32_ = NULL;
-		GError* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-		GError* _tmp35_ = NULL;
-		GError* _tmp36_ = NULL;
+		SpitPublishingPluginHost* _tmp32_;
+		GError* _tmp33_;
+		const gchar* _tmp34_;
+		GError* _tmp35_;
+		GError* _tmp36_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2724,7 +2739,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		_g_error_free0 (_error_);
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2726 "FacebookPublishing.c"
+#line 2741 "FacebookPublishing.c"
 	}
 	__finally1:
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2735,42 +2750,41 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		g_clear_error (&_inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2737 "FacebookPublishing.c"
+#line 2752 "FacebookPublishing.c"
 	}
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_albums_extracted (self);
-#line 2741 "FacebookPublishing.c"
+#line 2756 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2748 "FacebookPublishing.c"
+#line 2763 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2755 "FacebookPublishing.c"
+#line 2770 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self) {
-	PublishingFacebookPublishingParameters* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	PublishingFacebookPublishingParameters* _tmp0_;
+	const gchar* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
 	PublishingFacebookGraphMessage* create_album_message = NULL;
-	PublishingFacebookGraphSession* _tmp5_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	PublishingFacebookGraphMessage* _tmp10_ = NULL;
-	PublishingFacebookGraphSession* _tmp11_ = NULL;
+	PublishingFacebookGraphSession* _tmp4_;
+	PublishingFacebookPublishingParameters* _tmp5_;
+	const gchar* _tmp6_;
+	PublishingFacebookPublishingParameters* _tmp7_;
+	const gchar* _tmp8_;
+	PublishingFacebookGraphMessage* _tmp9_;
+	PublishingFacebookGraphSession* _tmp10_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2787,70 +2801,68 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->host;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = _ ("Creating album…");
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp3_, _tmp4_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_static_message_pane (_tmp3_, _ ("Creating album…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = self->priv->graph_session;
+	_tmp4_ = self->priv->graph_session;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = self->priv->publishing_params;
+	_tmp5_ = self->priv->publishing_params;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _tmp6_->new_album_name;
+	_tmp6_ = _tmp5_->new_album_name;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = self->priv->publishing_params;
+	_tmp7_ = self->priv->publishing_params;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = _tmp8_->privacy_object;
+	_tmp8_ = _tmp7_->privacy_object;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = publishing_facebook_graph_session_new_create_album (_tmp5_, _tmp7_, _tmp9_);
+	_tmp9_ = publishing_facebook_graph_session_new_create_album (_tmp4_, _tmp6_, _tmp8_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	create_album_message = _tmp10_;
+	create_album_message = _tmp9_;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (create_album_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self, 0);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (create_album_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self, 0);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = self->priv->graph_session;
+	_tmp10_ = self->priv->graph_session;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_graph_session_send_message (_tmp11_, create_album_message);
+	publishing_facebook_graph_session_send_message (_tmp10_, create_album_message);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (create_album_message);
-#line 2815 "FacebookPublishing.c"
+#line 2827 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_logout ((PublishingFacebookFacebookPublisher*) self);
-#line 2822 "FacebookPublishing.c"
+#line 2834 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_publish ((PublishingFacebookFacebookPublisher*) self, target_album, privacy_setting, target_resolution, strip_metadata);
-#line 2829 "FacebookPublishing.c"
+#line 2841 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp10_ = NULL;
-	PublishingFacebookAlbum** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	SpitPublishingPluginHost* _tmp12_ = NULL;
-	SpitPublishingPublisherMediaType _tmp13_ = 0;
-	GtkBuilder* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	SpitPublishingAuthenticator* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	PublishingFacebookPublishingOptionsPane* _tmp18_ = NULL;
-	PublishingFacebookPublishingOptionsPane* _tmp19_ = NULL;
-	PublishingFacebookPublishingOptionsPane* _tmp20_ = NULL;
-	SpitPublishingPluginHost* _tmp21_ = NULL;
-	PublishingFacebookPublishingOptionsPane* _tmp22_ = NULL;
+	GtkBuilder* _tmp1_;
+	const gchar* _tmp8_;
+	PublishingFacebookPublishingParameters* _tmp9_;
+	PublishingFacebookAlbum** _tmp10_;
+	gint _tmp10__length1;
+	SpitPublishingPluginHost* _tmp11_;
+	SpitPublishingPublisherMediaType _tmp12_;
+	GtkBuilder* _tmp13_;
+	gboolean _tmp14_;
+	SpitPublishingAuthenticator* _tmp15_;
+	gboolean _tmp16_;
+	PublishingFacebookPublishingOptionsPane* _tmp17_;
+	PublishingFacebookPublishingOptionsPane* _tmp18_;
+	PublishingFacebookPublishingOptionsPane* _tmp19_;
+	SpitPublishingPluginHost* _tmp20_;
+	PublishingFacebookPublishingOptionsPane* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -2864,16 +2876,16 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	_tmp1_ = gtk_builder_new ();
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	builder = _tmp1_;
-#line 2865 "FacebookPublishing.c"
+#line 2877 "FacebookPublishing.c"
 	{
-		GtkBuilder* _tmp2_ = NULL;
+		GtkBuilder* _tmp2_;
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = builder;
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "facebook_publishing_options_pane.ui", &_inner_error_);
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2874 "FacebookPublishing.c"
+#line 2886 "FacebookPublishing.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -2881,12 +2893,11 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	__catch2_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		SpitPublishingPluginHost* _tmp5_;
+		GError* _tmp6_;
+		GError* _tmp7_;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		e = _inner_error_;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2900,23 +2911,21 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->host;
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Facebook " \
-"can’t continue.");
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
+		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Facebook " \
+"can’t continue."));
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_);
+		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_error_free0 (_tmp8_);
+		_g_error_free0 (_tmp7_);
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (e);
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (builder);
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2916 "FacebookPublishing.c"
+#line 2925 "FacebookPublishing.c"
 	}
 	__finally2:
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2929,56 +2938,56 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		g_clear_error (&_inner_error_);
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2929 "FacebookPublishing.c"
+#line 2938 "FacebookPublishing.c"
 	}
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = self->priv->username;
+	_tmp8_ = self->priv->username;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = self->priv->publishing_params;
+	_tmp9_ = self->priv->publishing_params;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = _tmp10_->albums;
+	_tmp10_ = _tmp9_->albums;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11__length1 = _tmp10_->albums_length1;
+	_tmp10__length1 = _tmp9_->albums_length1;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = self->priv->host;
+	_tmp11_ = self->priv->host;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp12_);
+	_tmp12_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp11_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = builder;
+	_tmp13_ = builder;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp15_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self);
+	_tmp14_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = self->priv->authenticator;
+	_tmp15_ = self->priv->authenticator;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = spit_publishing_authenticator_can_logout (_tmp16_);
+	_tmp16_ = spit_publishing_authenticator_can_logout (_tmp15_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = publishing_facebook_publishing_options_pane_new (_tmp9_, _tmp11_, _tmp11__length1, _tmp13_, self, _tmp14_, _tmp15_, _tmp17_);
+	_tmp17_ = publishing_facebook_publishing_options_pane_new (_tmp8_, _tmp10_, _tmp10__length1, _tmp12_, self, _tmp13_, _tmp14_, _tmp16_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishing_options_pane = _tmp18_;
+	self->priv->publishing_options_pane = _tmp17_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = self->priv->publishing_options_pane;
+	_tmp18_ = self->priv->publishing_options_pane;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp19_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp18_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp20_ = self->priv->publishing_options_pane;
+	_tmp19_ = self->priv->publishing_options_pane;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp20_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp19_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = self->priv->host;
+	_tmp20_ = self->priv->host;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = self->priv->publishing_options_pane;
+	_tmp21_ = self->priv->publishing_options_pane;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2973 "FacebookPublishing.c"
+#line 2982 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2992,13 +3001,13 @@ static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebook
 	self->priv->running = FALSE;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 2991 "FacebookPublishing.c"
+#line 3000 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self, const gchar* album_name, const gchar* json) {
-	PublishingFacebookPublishingParameters* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
+	PublishingFacebookPublishingParameters* _tmp20_;
+	const gchar* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -3006,27 +3015,27 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 	g_return_if_fail (album_name != NULL);
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 3005 "FacebookPublishing.c"
+#line 3014 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
-		JsonParser* _tmp0_ = NULL;
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		JsonParser* _tmp0_;
+		JsonParser* _tmp1_;
+		const gchar* _tmp2_;
 		JsonNode* root = NULL;
-		JsonParser* _tmp3_ = NULL;
-		JsonNode* _tmp4_ = NULL;
-		JsonNode* _tmp5_ = NULL;
+		JsonParser* _tmp3_;
+		JsonNode* _tmp4_;
+		JsonNode* _tmp5_;
 		JsonObject* response_object = NULL;
-		JsonNode* _tmp6_ = NULL;
-		JsonObject* _tmp7_ = NULL;
-		JsonObject* _tmp8_ = NULL;
+		JsonNode* _tmp6_;
+		JsonObject* _tmp7_;
+		JsonObject* _tmp8_;
 		gchar* album_id = NULL;
-		JsonObject* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		PublishingFacebookPublishingParameters* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
+		JsonObject* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		PublishingFacebookPublishingParameters* _tmp12_;
+		const gchar* _tmp13_;
+		const gchar* _tmp14_;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3041,7 +3050,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 3040 "FacebookPublishing.c"
+#line 3049 "FacebookPublishing.c"
 			goto __catch3_g_error;
 		}
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3084,17 +3093,17 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		__vala_JsonNode_free0 (root);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 3083 "FacebookPublishing.c"
+#line 3092 "FacebookPublishing.c"
 	}
 	goto __finally3;
 	__catch3_g_error:
 	{
 		GError* _error_ = NULL;
-		SpitPublishingPluginHost* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
+		SpitPublishingPluginHost* _tmp15_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
+		GError* _tmp18_;
+		GError* _tmp19_;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3117,7 +3126,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		_g_error_free0 (_error_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3116 "FacebookPublishing.c"
+#line 3125 "FacebookPublishing.c"
 	}
 	__finally3:
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3128,7 +3137,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		g_clear_error (&_inner_error_);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3127 "FacebookPublishing.c"
+#line 3136 "FacebookPublishing.c"
 	}
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->publishing_params;
@@ -3138,7 +3147,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 	publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp20_, _tmp21_);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_upload (self);
-#line 3137 "FacebookPublishing.c"
+#line 3146 "FacebookPublishing.c"
 }
 
 
@@ -3149,35 +3158,35 @@ static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (P
 	g_debug ("FacebookPublishing.vala:382: EVENT: Authenticator login succeeded.");
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_authenticate_session (self);
-#line 3148 "FacebookPublishing.c"
+#line 3157 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self) {
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 3155 "FacebookPublishing.c"
+#line 3164 "FacebookPublishing.c"
 }
 
 
 static gpointer _g_variant_ref0 (gpointer self) {
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? g_variant_ref (self) : NULL;
-#line 3162 "FacebookPublishing.c"
+#line 3171 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self) {
 	GHashTable* parameter = NULL;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	GHashTable* _tmp1_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
+	GHashTable* _tmp1_;
 	GVariant* access_token = NULL;
 	gconstpointer _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GVariant* _tmp4_ = NULL;
-	PublishingFacebookGraphSession* _tmp5_ = NULL;
-	PublishingFacebookGraphSession* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
+	gboolean _tmp3_;
+	GVariant* _tmp4_;
+	PublishingFacebookGraphSession* _tmp5_;
+	PublishingFacebookGraphSession* _tmp6_;
+	const gchar* _tmp7_;
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3201,7 +3210,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 " not provide access token");
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_assert_not_reached ();
-#line 3199 "FacebookPublishing.c"
+#line 3208 "FacebookPublishing.c"
 	}
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->priv->graph_session;
@@ -3217,60 +3226,60 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 	_g_variant_unref0 (access_token);
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_hash_table_unref0 (parameter);
-#line 3215 "FacebookPublishing.c"
+#line 3224 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_complete ((PublishingFacebookFacebookPublisher*) self, _sender, num_photos_published);
-#line 3222 "FacebookPublishing.c"
+#line 3231 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self) {
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3229 "FacebookPublishing.c"
+#line 3238 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_status_updated ((PublishingFacebookFacebookPublisher*) self, file_number, fraction_complete);
-#line 3236 "FacebookPublishing.c"
+#line 3245 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self) {
 	gchar* _tmp0_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp8_ = NULL;
-	PublishingFacebookResolution _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	PublishingFacebookPublishingParameters* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	void* _tmp13_ = NULL;
-	GDestroyNotify _tmp14_ = NULL;
-	SpitPublishingProgressCallback _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
+	PublishingFacebookPublishingParameters* _tmp1_;
+	gint _tmp2_;
+	SpitPublishingPluginHost* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	PublishingFacebookPublishingParameters* _tmp8_;
+	PublishingFacebookResolution _tmp9_;
+	gint _tmp10_;
+	PublishingFacebookPublishingParameters* _tmp11_;
+	gboolean _tmp12_;
+	void* _tmp13_;
+	GDestroyNotify _tmp14_;
+	SpitPublishingProgressCallback _tmp15_;
+	gboolean _tmp16_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	SpitPublishingPublishable** _tmp19_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
-	PublishingFacebookGraphSession* _tmp20_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp21_ = NULL;
-	SpitPublishingPublishable** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	PublishingFacebookUploader* _tmp23_ = NULL;
-	PublishingFacebookUploader* _tmp24_ = NULL;
-	PublishingFacebookUploader* _tmp25_ = NULL;
-	PublishingFacebookUploader* _tmp26_ = NULL;
+	SpitPublishingPluginHost* _tmp17_;
+	gint _tmp18_;
+	SpitPublishingPublishable** _tmp19_;
+	gint publishables_length1;
+	gint _publishables_size_;
+	PublishingFacebookGraphSession* _tmp20_;
+	PublishingFacebookPublishingParameters* _tmp21_;
+	SpitPublishingPublishable** _tmp22_;
+	gint _tmp22__length1;
+	PublishingFacebookUploader* _tmp23_;
+	PublishingFacebookUploader* _tmp24_;
+	PublishingFacebookUploader* _tmp25_;
+	PublishingFacebookUploader* _tmp26_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3279,18 +3288,18 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	_tmp2_ = _tmp1_->target_album;
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 3277 "FacebookPublishing.c"
-		gchar* _tmp3_ = NULL;
+#line 3286 "FacebookPublishing.c"
+		gchar* _tmp3_;
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = g_strdup ("(none)");
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp3_;
-#line 3285 "FacebookPublishing.c"
+#line 3294 "FacebookPublishing.c"
 	} else {
-		PublishingFacebookPublishingParameters* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		PublishingFacebookPublishingParameters* _tmp4_;
+		gchar* _tmp5_;
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->publishing_params;
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3299,7 +3308,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 		_g_free0 (_tmp0_);
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp5_;
-#line 3297 "FacebookPublishing.c"
+#line 3306 "FacebookPublishing.c"
 	}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:402: ACTION: uploading photos to album '%s'", _tmp0_);
@@ -3343,7 +3352,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 		_g_free0 (_tmp0_);
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3341 "FacebookPublishing.c"
+#line 3350 "FacebookPublishing.c"
 	}
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = self->priv->host;
@@ -3385,13 +3394,13 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp0_);
-#line 3383 "FacebookPublishing.c"
+#line 3392 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3404,12 +3413,12 @@ static void publishing_facebook_facebook_publisher_do_show_success_pane (Publish
 	_tmp1_ = self->priv->host;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3402 "FacebookPublishing.c"
+#line 3411 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_) {
-	GError* _tmp0_ = NULL;
+	GError* _tmp0_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3418,27 +3427,27 @@ static void publishing_facebook_facebook_publisher_on_generic_error (PublishingF
 	if (g_error_matches (_tmp0_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_logout (self);
-#line 3416 "FacebookPublishing.c"
+#line 3425 "FacebookPublishing.c"
 	} else {
-		SpitPublishingPluginHost* _tmp1_ = NULL;
-		GError* _tmp2_ = NULL;
+		SpitPublishingPluginHost* _tmp1_;
+		GError* _tmp2_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->host;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = _error_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp1_, _tmp2_);
-#line 3426 "FacebookPublishing.c"
+#line 3435 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self) {
-	PublishingFacebookGraphSession* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	gboolean _tmp2_ = FALSE;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	PublishingFacebookGraphSession* _tmp0_;
+	guint _tmp1_;
+	gboolean _tmp2_;
+	PublishingFacebookGraphSession* _tmp3_;
+	gboolean _tmp4_;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3453,7 +3462,7 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
 	if (!_tmp2_) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3451 "FacebookPublishing.c"
+#line 3460 "FacebookPublishing.c"
 	}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->graph_session;
@@ -3466,22 +3475,22 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
 "e available.");
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_user_info (self);
-#line 3463 "FacebookPublishing.c"
+#line 3472 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingFacebookGraphMessage* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingFacebookGraphMessage* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingFacebookGraphMessage* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingFacebookGraphMessage* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3504,7 +3513,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed
 	if (!_tmp4_) {
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3501 "FacebookPublishing.c"
+#line 3510 "FacebookPublishing.c"
 	}
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
@@ -3527,17 +3536,17 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed
 	publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp10_);
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 3523 "FacebookPublishing.c"
+#line 3532 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	GError* _tmp5_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	GError* _tmp5_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3560,7 +3569,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub
 	if (!_tmp4_) {
 #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3556 "FacebookPublishing.c"
+#line 3565 "FacebookPublishing.c"
 	}
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:501: EVENT: fetching user info generated and e" \
@@ -3569,14 +3578,14 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub
 	_tmp5_ = _error_;
 #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 3564 "FacebookPublishing.c"
+#line 3573 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3585,7 +3594,7 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi
 	if (!_tmp0_) {
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3580 "FacebookPublishing.c"
+#line 3589 "FacebookPublishing.c"
 	}
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->uid;
@@ -3596,22 +3605,22 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi
 "onse: uid = %s; name = %s.", _tmp1_, _tmp2_);
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_album_descriptions (self);
-#line 3590 "FacebookPublishing.c"
+#line 3599 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingFacebookGraphMessage* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingFacebookGraphMessage* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingFacebookGraphMessage* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingFacebookGraphMessage* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3634,7 +3643,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu
 	if (!_tmp4_) {
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3628 "FacebookPublishing.c"
+#line 3637 "FacebookPublishing.c"
 	}
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
@@ -3657,17 +3666,17 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu
 	publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp10_);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 3650 "FacebookPublishing.c"
+#line 3659 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	GError* _tmp5_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	GError* _tmp5_;
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3690,7 +3699,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis
 	if (!_tmp4_) {
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3683 "FacebookPublishing.c"
+#line 3692 "FacebookPublishing.c"
 	}
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:536: EVENT: album description fetch attempt ge" \
@@ -3699,15 +3708,15 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis
 	_tmp5_ = err;
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 3691 "FacebookPublishing.c"
+#line 3700 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	PublishingFacebookPublishingParameters* _tmp1_ = NULL;
-	PublishingFacebookAlbum** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gboolean _tmp0_;
+	PublishingFacebookPublishingParameters* _tmp1_;
+	PublishingFacebookAlbum** _tmp2_;
+	gint _tmp2__length1;
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3716,7 +3725,7 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi
 	if (!_tmp0_) {
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3708 "FacebookPublishing.c"
+#line 3717 "FacebookPublishing.c"
 	}
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishing_params;
@@ -3729,16 +3738,16 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi
 "rom JSON response", _tmp2__length1);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_publishing_options_pane (self);
-#line 3720 "FacebookPublishing.c"
+#line 3729 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self) {
-	PublishingFacebookPublishingOptionsPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookPublishingOptionsPane* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
+	PublishingFacebookPublishingOptionsPane* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookPublishingOptionsPane* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3759,33 +3768,33 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_lo
 	if (!_tmp4_) {
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3750 "FacebookPublishing.c"
+#line 3759 "FacebookPublishing.c"
 	}
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:558: EVENT: user clicked 'Logout' in publishin" \
 "g options pane.");
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_logout (self);
-#line 3756 "FacebookPublishing.c"
+#line 3765 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution resolution, gboolean strip_metadata) {
-	PublishingFacebookPublishingOptionsPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookPublishingOptionsPane* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingFacebookPublishingParameters* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	PublishingFacebookPublishingParameters* _tmp8_ = NULL;
-	PublishingFacebookResolution _tmp9_ = 0;
-	PublishingFacebookResolution _tmp10_ = 0;
-	PublishingFacebookPublishingParameters* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
+	PublishingFacebookPublishingOptionsPane* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookPublishingOptionsPane* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingFacebookPublishingParameters* _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+	PublishingFacebookPublishingParameters* _tmp8_;
+	PublishingFacebookResolution _tmp9_;
+	PublishingFacebookResolution _tmp10_;
+	PublishingFacebookPublishingParameters* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
+	const gchar* _tmp14_;
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3808,7 +3817,7 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 	if (!_tmp4_) {
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3798 "FacebookPublishing.c"
+#line 3807 "FacebookPublishing.c"
 	}
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:571: EVENT: user clicked 'Publish' in publishi" \
@@ -3847,11 +3856,11 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 	_tmp14_ = target_album;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp14_ != NULL) {
-#line 3836 "FacebookPublishing.c"
-		PublishingFacebookPublishingParameters* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		PublishingFacebookPublishingParameters* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
+#line 3845 "FacebookPublishing.c"
+		PublishingFacebookPublishingParameters* _tmp15_;
+		const gchar* _tmp16_;
+		PublishingFacebookPublishingParameters* _tmp17_;
+		gint _tmp18_;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = self->priv->publishing_params;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3866,11 +3875,11 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 		if (_tmp18_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_upload (self);
-#line 3855 "FacebookPublishing.c"
+#line 3864 "FacebookPublishing.c"
 		} else {
-			PublishingFacebookPublishingParameters* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			PublishingFacebookPublishingParameters* _tmp19_;
+			const gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp19_ = self->priv->publishing_params;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3883,32 +3892,32 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 			_tmp19_->new_album_name = _tmp21_;
 #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_create_new_album (self);
-#line 3872 "FacebookPublishing.c"
+#line 3881 "FacebookPublishing.c"
 		}
 	} else {
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_upload (self);
-#line 3877 "FacebookPublishing.c"
+#line 3886 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingFacebookPublishingParameters* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingFacebookGraphMessage* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	PublishingFacebookGraphMessage* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	PublishingFacebookPublishingParameters* _tmp4_;
+	const gchar* _tmp5_;
+	gboolean _tmp6_;
+	PublishingFacebookGraphMessage* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingFacebookPublishingParameters* _tmp10_;
+	const gchar* _tmp11_;
+	PublishingFacebookGraphMessage* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3937,7 +3946,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu
 	if (!_tmp6_) {
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3926 "FacebookPublishing.c"
+#line 3935 "FacebookPublishing.c"
 	}
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = message;
@@ -3964,17 +3973,17 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu
 	publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (self, _tmp11_, _tmp14_);
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 3952 "FacebookPublishing.c"
+#line 3961 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	GError* _tmp5_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	GError* _tmp5_;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3997,7 +4006,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis
 	if (!_tmp4_) {
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3985 "FacebookPublishing.c"
+#line 3994 "FacebookPublishing.c"
 	}
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:618: EVENT: attempt to create new album genera" \
@@ -4006,19 +4015,19 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis
 	_tmp5_ = err;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 3993 "FacebookPublishing.c"
+#line 4002 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_ = FALSE;
-	gdouble _tmp1_ = 0.0;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gboolean _tmp0_;
+	gdouble _tmp1_;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4027,7 +4036,7 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub
 	if (!_tmp0_) {
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4014 "FacebookPublishing.c"
+#line 4023 "FacebookPublishing.c"
 	}
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -4050,17 +4059,17 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub
 	_tmp5_ = completed_fraction;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4036 "FacebookPublishing.c"
+#line 4045 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, gint num_published) {
-	PublishingFacebookUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
+	PublishingFacebookUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookUploader* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	gint _tmp5_;
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4083,7 +4092,7 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin
 	if (!_tmp4_) {
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4069 "FacebookPublishing.c"
+#line 4078 "FacebookPublishing.c"
 	}
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = num_published;
@@ -4092,20 +4101,20 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin
 "%d items published.", _tmp5_);
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_success_pane (self);
-#line 4077 "FacebookPublishing.c"
+#line 4086 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, GError* err) {
-	PublishingFacebookUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	GError* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
+	PublishingFacebookUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookUploader* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	GError* _tmp5_;
+	const gchar* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GError* _tmp8_;
 #line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4128,7 +4137,7 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa
 	if (!_tmp4_) {
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4113 "FacebookPublishing.c"
+#line 4122 "FacebookPublishing.c"
 	}
 #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
@@ -4143,15 +4152,15 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa
 	_tmp8_ = err;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 4127 "FacebookPublishing.c"
+#line 4136 "FacebookPublishing.c"
 }
 
 
 static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingFacebookFacebookPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4162,13 +4171,13 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
 	result = _tmp1_;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4146 "FacebookPublishing.c"
+#line 4155 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4177,13 +4186,13 @@ gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebo
 	result = _tmp0_;
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4161 "FacebookPublishing.c"
+#line 4170 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4192,31 +4201,31 @@ gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingF
 	result = _tmp0_;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4176 "FacebookPublishing.c"
+#line 4185 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_authenticator_succeeded ((PublishingFacebookFacebookPublisher*) self);
-#line 4183 "FacebookPublishing.c"
+#line 4192 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self) {
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_authenticator_failed ((PublishingFacebookFacebookPublisher*) self);
-#line 4190 "FacebookPublishing.c"
+#line 4199 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingFacebookFacebookPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	PublishingFacebookPublishingParameters* _tmp1_ = NULL;
-	SpitPublishingAuthenticator* _tmp2_ = NULL;
-	SpitPublishingAuthenticator* _tmp3_ = NULL;
-	SpitPublishingAuthenticator* _tmp4_ = NULL;
+	gboolean _tmp0_;
+	PublishingFacebookPublishingParameters* _tmp1_;
+	SpitPublishingAuthenticator* _tmp2_;
+	SpitPublishingAuthenticator* _tmp3_;
+	SpitPublishingAuthenticator* _tmp4_;
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4225,7 +4234,7 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 	if (_tmp0_) {
 #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4209 "FacebookPublishing.c"
+#line 4218 "FacebookPublishing.c"
 	}
 #line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:674: FacebookPublisher: starting interaction.");
@@ -4249,13 +4258,13 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 	_tmp4_ = self->priv->authenticator;
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_authenticator_authenticate (_tmp4_);
-#line 4233 "FacebookPublishing.c"
+#line 4242 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFacebookFacebookPublisher * self;
-	PublishingFacebookGraphSession* _tmp0_ = NULL;
+	PublishingFacebookGraphSession* _tmp0_;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
 #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4264,26 +4273,26 @@ static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPubl
 	_tmp0_ = self->priv->graph_session;
 #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4248 "FacebookPublishing.c"
-		PublishingFacebookGraphSession* _tmp1_ = NULL;
+#line 4257 "FacebookPublishing.c"
+		PublishingFacebookGraphSession* _tmp1_;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->graph_session;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_stop_transactions (_tmp1_);
-#line 4254 "FacebookPublishing.c"
+#line 4263 "FacebookPublishing.c"
 	}
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = NULL;
 #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 4260 "FacebookPublishing.c"
+#line 4269 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingFacebookFacebookPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4292,7 +4301,7 @@ static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPubl
 	result = _tmp0_;
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4276 "FacebookPublishing.c"
+#line 4285 "FacebookPublishing.c"
 }
 
 
@@ -4303,7 +4312,7 @@ static void publishing_facebook_facebook_publisher_class_init (PublishingFaceboo
 	g_type_class_add_private (klass, sizeof (PublishingFacebookFacebookPublisherPrivate));
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_facebook_publisher_finalize;
-#line 4287 "FacebookPublishing.c"
+#line 4296 "FacebookPublishing.c"
 }
 
 
@@ -4311,14 +4320,14 @@ static void publishing_facebook_facebook_publisher_spit_publishing_publisher_int
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_get_service;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_start;
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_start;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_stop;
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_stop;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_is_running;
-#line 4302 "FacebookPublishing.c"
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_is_running;
+#line 4311 "FacebookPublishing.c"
 }
 
 
@@ -4329,6 +4338,10 @@ static void publishing_facebook_facebook_publisher_instance_init (PublishingFace
 	self->priv->host = NULL;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = NULL;
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->service = NULL;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4343,11 +4356,11 @@ static void publishing_facebook_facebook_publisher_instance_init (PublishingFace
 	self->priv->uid = NULL;
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->username = NULL;
-#line 4327 "FacebookPublishing.c"
+#line 4340 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_finalize (GObject* obj) {
+static void publishing_facebook_facebook_publisher_finalize (GObject * obj) {
 	PublishingFacebookFacebookPublisher * self;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
@@ -4375,7 +4388,7 @@ static void publishing_facebook_facebook_publisher_finalize (GObject* obj) {
 	_g_free0 (self->priv->username);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_facebook_publisher_parent_class)->finalize (obj);
-#line 4359 "FacebookPublishing.c"
+#line 4372 "FacebookPublishing.c"
 }
 
 
@@ -4400,132 +4413,132 @@ static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** sel
 	result = g_new0 (PublishingFacebookAlbum*, length + 1);
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 4384 "FacebookPublishing.c"
-		PublishingFacebookAlbum* _tmp0_ = NULL;
+#line 4397 "FacebookPublishing.c"
+		PublishingFacebookAlbum* _tmp0_;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _publishing_facebook_album_ref0 (self[i]);
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 4390 "FacebookPublishing.c"
+#line 4403 "FacebookPublishing.c"
 	}
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4394 "FacebookPublishing.c"
+#line 4407 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_create_new_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4401 "FacebookPublishing.c"
+#line 4414 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_use_existing_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4408 "FacebookPublishing.c"
+#line 4421 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_publish_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4415 "FacebookPublishing.c"
+#line 4428 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_logout_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4422 "FacebookPublishing.c"
+#line 4435 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_size_changed ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4429 "FacebookPublishing.c"
+#line 4442 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) {
 	PublishingFacebookPublishingOptionsPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GSList* _tmp4_ = NULL;
-	GSList* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	PublishingFacebookAlbum** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	PublishingFacebookAlbum** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	gint _tmp9_ = 0;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	PublishingFacebookResolution* _tmp12_ = NULL;
-	PublishingFacebookFacebookPublisher* _tmp13_ = NULL;
-	PublishingFacebookFacebookPublisher* _tmp14_ = NULL;
-	SpitPublishingPublisherMediaType _tmp15_ = 0;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
-	GtkBox* _tmp19_ = NULL;
-	GtkBuilder* _tmp20_ = NULL;
-	GObject* _tmp21_ = NULL;
-	GtkRadioButton* _tmp22_ = NULL;
-	GtkBuilder* _tmp23_ = NULL;
-	GObject* _tmp24_ = NULL;
-	GtkRadioButton* _tmp25_ = NULL;
-	GtkBuilder* _tmp26_ = NULL;
-	GObject* _tmp27_ = NULL;
-	GtkComboBoxText* _tmp28_ = NULL;
-	GtkBuilder* _tmp29_ = NULL;
-	GObject* _tmp30_ = NULL;
-	GtkComboBoxText* _tmp31_ = NULL;
-	GtkBuilder* _tmp32_ = NULL;
-	GObject* _tmp33_ = NULL;
-	GtkButton* _tmp34_ = NULL;
-	GtkBuilder* _tmp35_ = NULL;
-	GObject* _tmp36_ = NULL;
-	GtkButton* _tmp37_ = NULL;
-	gboolean _tmp38_ = FALSE;
-	GtkBuilder* _tmp43_ = NULL;
-	GObject* _tmp44_ = NULL;
-	GtkEntry* _tmp45_ = NULL;
-	GtkBuilder* _tmp46_ = NULL;
-	GObject* _tmp47_ = NULL;
-	GtkComboBoxText* _tmp48_ = NULL;
-	GtkBuilder* _tmp49_ = NULL;
-	GObject* _tmp50_ = NULL;
-	GtkLabel* _tmp51_ = NULL;
-	GtkBuilder* _tmp52_ = NULL;
-	GObject* _tmp53_ = NULL;
-	GtkCheckButton* _tmp54_ = NULL;
-	GtkRadioButton* _tmp55_ = NULL;
-	GtkRadioButton* _tmp56_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
+	GtkBuilder* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GSList* _tmp4_;
+	GSList* _tmp5_;
+	guint _tmp6_;
+	PublishingFacebookAlbum** _tmp7_;
+	gint _tmp7__length1;
+	PublishingFacebookAlbum** _tmp8_;
+	gint _tmp8__length1;
+	gint _tmp9_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_;
+	gint _tmp11_;
+	PublishingFacebookResolution* _tmp12_;
+	PublishingFacebookFacebookPublisher* _tmp13_;
+	PublishingFacebookFacebookPublisher* _tmp14_;
+	SpitPublishingPublisherMediaType _tmp15_;
+	GtkBuilder* _tmp16_;
+	GObject* _tmp17_;
+	GtkBox* _tmp18_;
+	GtkBox* _tmp19_;
+	GtkBuilder* _tmp20_;
+	GObject* _tmp21_;
+	GtkRadioButton* _tmp22_;
+	GtkBuilder* _tmp23_;
+	GObject* _tmp24_;
+	GtkRadioButton* _tmp25_;
+	GtkBuilder* _tmp26_;
+	GObject* _tmp27_;
+	GtkComboBoxText* _tmp28_;
+	GtkBuilder* _tmp29_;
+	GObject* _tmp30_;
+	GtkComboBoxText* _tmp31_;
+	GtkBuilder* _tmp32_;
+	GObject* _tmp33_;
+	GtkButton* _tmp34_;
+	GtkBuilder* _tmp35_;
+	GObject* _tmp36_;
+	GtkButton* _tmp37_;
+	gboolean _tmp38_;
+	GtkBuilder* _tmp43_;
+	GObject* _tmp44_;
+	GtkEntry* _tmp45_;
+	GtkBuilder* _tmp46_;
+	GObject* _tmp47_;
+	GtkComboBoxText* _tmp48_;
+	GtkBuilder* _tmp49_;
+	GObject* _tmp50_;
+	GtkLabel* _tmp51_;
+	GtkBuilder* _tmp52_;
+	GObject* _tmp53_;
+	GtkCheckButton* _tmp54_;
+	GtkRadioButton* _tmp55_;
+	GtkRadioButton* _tmp56_;
 	gchar* label_text = NULL;
-	const gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	SpitPublishingPublisherMediaType _tmp59_ = 0;
-	GtkLabel* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	GtkCheckButton* _tmp64_ = NULL;
-	gboolean _tmp65_ = FALSE;
-	GtkComboBoxText* _tmp66_ = NULL;
-	GtkButton* _tmp67_ = NULL;
-	GtkButton* _tmp68_ = NULL;
-	GtkComboBoxText* _tmp69_ = NULL;
-	PublishingFacebookFacebookPublisher* _tmp70_ = NULL;
-	gint _tmp71_ = 0;
-	GtkComboBoxText* _tmp72_ = NULL;
+	const gchar* _tmp57_;
+	gchar* _tmp58_;
+	SpitPublishingPublisherMediaType _tmp59_;
+	GtkLabel* _tmp62_;
+	const gchar* _tmp63_;
+	GtkCheckButton* _tmp64_;
+	gboolean _tmp65_;
+	GtkComboBoxText* _tmp66_;
+	GtkButton* _tmp67_;
+	GtkButton* _tmp68_;
+	GtkComboBoxText* _tmp69_;
+	PublishingFacebookFacebookPublisher* _tmp70_;
+	gint _tmp71_;
+	GtkComboBoxText* _tmp72_;
 	gboolean _tmp73_ = FALSE;
 	gboolean _tmp74_ = FALSE;
-	GtkRadioButton* _tmp75_ = NULL;
-	GtkComboBoxText* _tmp80_ = NULL;
-	SpitPublishingPublisherMediaType _tmp81_ = 0;
+	GtkRadioButton* _tmp75_;
+	GtkComboBoxText* _tmp80_;
+	SpitPublishingPublisherMediaType _tmp81_;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4684,11 +4697,11 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 	_tmp38_ = can_logout;
 #line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp38_) {
-#line 4668 "FacebookPublishing.c"
-		GtkButton* _tmp39_ = NULL;
-		GtkContainer* _tmp40_ = NULL;
-		GtkContainer* _tmp41_ = NULL;
-		GtkButton* _tmp42_ = NULL;
+#line 4681 "FacebookPublishing.c"
+		GtkButton* _tmp39_;
+		GtkContainer* _tmp40_;
+		GtkContainer* _tmp41_;
+		GtkButton* _tmp42_;
 #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp39_ = self->priv->logout_button;
 #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4699,7 +4712,7 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 		_tmp42_ = self->priv->logout_button;
 #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 4683 "FacebookPublishing.c"
+#line 4696 "FacebookPublishing.c"
 	}
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = self->priv->builder;
@@ -4759,9 +4772,9 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 	_tmp59_ = media_type;
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((_tmp59_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 4743 "FacebookPublishing.c"
-		const gchar* _tmp60_ = NULL;
-		gchar* _tmp61_ = NULL;
+#line 4756 "FacebookPublishing.c"
+		const gchar* _tmp60_;
+		gchar* _tmp61_;
 #line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp60_ = label_text;
 #line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4770,7 +4783,7 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 		_g_free0 (label_text);
 #line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		label_text = _tmp61_;
-#line 4754 "FacebookPublishing.c"
+#line 4767 "FacebookPublishing.c"
 	}
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp62_ = self->priv->how_to_label;
@@ -4816,10 +4829,10 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 	_tmp75_ = self->priv->create_new_radio;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp75_ != NULL) {
-#line 4800 "FacebookPublishing.c"
-		GtkRadioButton* _tmp76_ = NULL;
-		gboolean _tmp77_ = FALSE;
-		gboolean _tmp78_ = FALSE;
+#line 4813 "FacebookPublishing.c"
+		GtkRadioButton* _tmp76_;
+		gboolean _tmp77_;
+		gboolean _tmp78_;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp76_ = self->priv->create_new_radio;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4828,24 +4841,24 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 		_tmp78_ = _tmp77_;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp74_ = _tmp78_;
-#line 4812 "FacebookPublishing.c"
+#line 4825 "FacebookPublishing.c"
 	} else {
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp74_ = FALSE;
-#line 4816 "FacebookPublishing.c"
+#line 4829 "FacebookPublishing.c"
 	}
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp74_) {
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp73_ = TRUE;
-#line 4822 "FacebookPublishing.c"
+#line 4835 "FacebookPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp79_ = 0;
+		SpitPublishingPublisherMediaType _tmp79_;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp79_ = media_type;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp73_ = (_tmp79_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 4829 "FacebookPublishing.c"
+#line 4842 "FacebookPublishing.c"
 	}
 #line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = self->priv->visibility_combo;
@@ -4855,14 +4868,14 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 	_tmp81_ = media_type;
 #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp81_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4839 "FacebookPublishing.c"
-		GtkCheckButton* _tmp82_ = NULL;
-		GtkCheckButton* _tmp83_ = NULL;
-		GtkComboBoxText* _tmp84_ = NULL;
-		GtkRadioButton* _tmp85_ = NULL;
-		GtkRadioButton* _tmp86_ = NULL;
-		GtkComboBoxText* _tmp87_ = NULL;
-		GtkEntry* _tmp88_ = NULL;
+#line 4852 "FacebookPublishing.c"
+		GtkCheckButton* _tmp82_;
+		GtkCheckButton* _tmp83_;
+		GtkComboBoxText* _tmp84_;
+		GtkRadioButton* _tmp85_;
+		GtkRadioButton* _tmp86_;
+		GtkComboBoxText* _tmp87_;
+		GtkEntry* _tmp88_;
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp82_ = self->priv->strip_metadata_check;
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4891,26 +4904,26 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 		_tmp88_ = self->priv->new_album_entry;
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4875 "FacebookPublishing.c"
+#line 4888 "FacebookPublishing.c"
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (label_text);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 4881 "FacebookPublishing.c"
+#line 4894 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_options_pane_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, username, albums, albums_length1, media_type, publisher, builder, strip_metadata, can_logout);
-#line 4888 "FacebookPublishing.c"
+#line 4901 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self) {
 	gboolean result = FALSE;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	SpitPublishingPublisherMediaType _tmp0_;
 #line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4919,27 +4932,27 @@ static gboolean publishing_facebook_publishing_options_pane_publishing_photos (P
 	result = (_tmp0_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0;
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4903 "FacebookPublishing.c"
+#line 4916 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self) {
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 4910 "FacebookPublishing.c"
+#line 4923 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self) {
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
+	gint _tmp0__length1;
 #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->privacy_descriptions;
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 4923 "FacebookPublishing.c"
+#line 4936 "FacebookPublishing.c"
 	{
 		PublishingFacebookPublishingOptionsPanePrivacyDescription** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -4951,18 +4964,18 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 		p_collection_length1 = _tmp0__length1;
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (p_it = 0; p_it < _tmp0__length1; p_it = p_it + 1) {
-#line 4935 "FacebookPublishing.c"
-			PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_ = NULL;
+#line 4948 "FacebookPublishing.c"
+			PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_;
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* p = NULL;
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = _publishing_facebook_publishing_options_pane_privacy_description_ref0 (p_collection[p_it]);
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			p = _tmp1_;
-#line 4942 "FacebookPublishing.c"
+#line 4955 "FacebookPublishing.c"
 			{
-				GtkComboBoxText* _tmp2_ = NULL;
-				PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
+				GtkComboBoxText* _tmp2_;
+				PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_;
+				const gchar* _tmp4_;
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp2_ = self->priv->visibility_combo;
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4973,7 +4986,7 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_publishing_facebook_publishing_options_pane_privacy_description_unref0 (p);
-#line 4957 "FacebookPublishing.c"
+#line 4970 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -4981,15 +4994,15 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 
 
 static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self) {
-	PublishingFacebookResolution* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingFacebookResolution* _tmp0_;
+	gint _tmp0__length1;
 #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->possible_resolutions;
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->possible_resolutions_length1;
-#line 4973 "FacebookPublishing.c"
+#line 4986 "FacebookPublishing.c"
 	{
 		PublishingFacebookResolution* res_collection = NULL;
 		gint res_collection_length1 = 0;
@@ -5001,16 +5014,16 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
 		res_collection_length1 = _tmp0__length1;
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (res_it = 0; res_it < _tmp0__length1; res_it = res_it + 1) {
-#line 4985 "FacebookPublishing.c"
+#line 4998 "FacebookPublishing.c"
 			PublishingFacebookResolution res = 0;
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			res = res_collection[res_it];
-#line 4989 "FacebookPublishing.c"
+#line 5002 "FacebookPublishing.c"
 			{
-				GtkComboBoxText* _tmp1_ = NULL;
-				PublishingFacebookResolution _tmp2_ = 0;
-				gchar* _tmp3_ = NULL;
-				gchar* _tmp4_ = NULL;
+				GtkComboBoxText* _tmp1_;
+				PublishingFacebookResolution _tmp2_;
+				gchar* _tmp3_;
+				gchar* _tmp4_;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = self->priv->resolution_combo;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5023,7 +5036,7 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
 				gtk_combo_box_text_append_text (_tmp1_, _tmp4_);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp4_);
-#line 5007 "FacebookPublishing.c"
+#line 5020 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -5031,9 +5044,9 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
 
 
 static void publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self) {
-	GtkRadioButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GtkRadioButton* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5044,12 +5057,12 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
 	_tmp2_ = _tmp1_;
 #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 5028 "FacebookPublishing.c"
-		GtkComboBoxText* _tmp3_ = NULL;
-		GtkEntry* _tmp4_ = NULL;
-		GtkComboBoxText* _tmp5_ = NULL;
-		SpitPublishingPublisherMediaType _tmp6_ = 0;
-		GtkComboBoxText* _tmp7_ = NULL;
+#line 5041 "FacebookPublishing.c"
+		GtkComboBoxText* _tmp3_;
+		GtkEntry* _tmp4_;
+		GtkComboBoxText* _tmp5_;
+		SpitPublishingPublisherMediaType _tmp6_;
+		GtkComboBoxText* _tmp7_;
 #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
 #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5068,15 +5081,15 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
 		_tmp7_ = self->priv->existing_albums_combo;
 #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5052 "FacebookPublishing.c"
+#line 5065 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self) {
-	GtkRadioButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GtkRadioButton* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5087,11 +5100,11 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
 	_tmp2_ = _tmp1_;
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 5071 "FacebookPublishing.c"
-		GtkComboBoxText* _tmp3_ = NULL;
-		GtkEntry* _tmp4_ = NULL;
-		GtkEntry* _tmp5_ = NULL;
-		GtkComboBoxText* _tmp6_ = NULL;
+#line 5084 "FacebookPublishing.c"
+		GtkComboBoxText* _tmp3_;
+		GtkEntry* _tmp4_;
+		GtkEntry* _tmp5_;
+		GtkComboBoxText* _tmp6_;
 #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
 #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5108,15 +5121,15 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
 		_tmp6_ = self->priv->visibility_combo;
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 5092 "FacebookPublishing.c"
+#line 5105 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self) {
-	PublishingFacebookFacebookPublisher* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	PublishingFacebookFacebookPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5127,7 +5140,7 @@ static void publishing_facebook_publishing_options_pane_on_size_changed (Publish
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5111 "FacebookPublishing.c"
+#line 5124 "FacebookPublishing.c"
 }
 
 
@@ -5135,28 +5148,28 @@ static void publishing_facebook_publishing_options_pane_on_logout_button_clicked
 #line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 5120 "FacebookPublishing.c"
+	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 5133 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
 	gchar* album_name = NULL;
 	gchar* privacy_setting = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
+	gint _tmp0__length1;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 	PublishingFacebookResolution resolution_setting = 0;
-	gboolean _tmp6_ = FALSE;
-	const gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	PublishingFacebookResolution _tmp21_ = 0;
-	GtkCheckButton* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
+	gboolean _tmp6_;
+	const gchar* _tmp19_;
+	const gchar* _tmp20_;
+	PublishingFacebookResolution _tmp21_;
+	GtkCheckButton* _tmp22_;
+	gboolean _tmp23_;
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5179,15 +5192,15 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 	_tmp6_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 5163 "FacebookPublishing.c"
-		PublishingFacebookResolution* _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		GtkComboBoxText* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		PublishingFacebookResolution _tmp10_ = 0;
-		GtkRadioButton* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		gboolean _tmp13_ = FALSE;
+#line 5176 "FacebookPublishing.c"
+		PublishingFacebookResolution* _tmp7_;
+		gint _tmp7__length1;
+		GtkComboBoxText* _tmp8_;
+		gint _tmp9_;
+		PublishingFacebookResolution _tmp10_;
+		GtkRadioButton* _tmp11_;
+		gboolean _tmp12_;
+		gboolean _tmp13_;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->possible_resolutions;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5208,9 +5221,9 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 		_tmp13_ = _tmp12_;
 #line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp13_) {
-#line 5192 "FacebookPublishing.c"
-			GtkComboBoxText* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
+#line 5205 "FacebookPublishing.c"
+			GtkComboBoxText* _tmp14_;
+			gchar* _tmp15_;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp14_ = self->priv->existing_albums_combo;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5219,11 +5232,11 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 			_g_free0 (album_name);
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp15_;
-#line 5203 "FacebookPublishing.c"
+#line 5216 "FacebookPublishing.c"
 		} else {
-			GtkEntry* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+			GtkEntry* _tmp16_;
+			const gchar* _tmp17_;
+			gchar* _tmp18_;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp16_ = self->priv->new_album_entry;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5234,7 +5247,7 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 			_g_free0 (album_name);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp18_;
-#line 5218 "FacebookPublishing.c"
+#line 5231 "FacebookPublishing.c"
 		}
 	} else {
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5243,7 +5256,7 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 		_g_free0 (album_name);
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_name = NULL;
-#line 5227 "FacebookPublishing.c"
+#line 5240 "FacebookPublishing.c"
 	}
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = album_name;
@@ -5256,86 +5269,83 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit_by_name (self, "publish", _tmp19_, _tmp20_, _tmp21_, _tmp23_);
+	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp19_, _tmp20_, _tmp21_, _tmp23_);
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (privacy_setting);
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (album_name);
-#line 5245 "FacebookPublishing.c"
+#line 5258 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5256 "FacebookPublishing.c"
+#line 5269 "FacebookPublishing.c"
 	}
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5262 "FacebookPublishing.c"
+#line 5275 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5273 "FacebookPublishing.c"
+#line 5286 "FacebookPublishing.c"
 	}
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5279 "FacebookPublishing.c"
+#line 5292 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5290 "FacebookPublishing.c"
+#line 5303 "FacebookPublishing.c"
 	}
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5296 "FacebookPublishing.c"
+#line 5309 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self, int* result_length1) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** result = NULL;
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _result_ = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp6_ = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp9_ = NULL;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp1_;
+	gint _tmp1__length1;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp2_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp3_;
+	gint _tmp3__length1;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp4_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp5_;
+	gint _tmp5__length1;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp6_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp7_;
+	gint _tmp7__length1;
 #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5351,91 +5361,85 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _ ("Just me");
+	_tmp2_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Just me"), "{ 'value' : 'SELF' }");
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp2_, "{ 'value' : 'SELF' }");
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = _result_;
+	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3_ = _result_;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _ ("Friends");
+	_tmp3__length1 = _result__length1;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp5_, "{ 'value' : 'ALL_FRIENDS' }");
+	_tmp4_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Friends"), "{ 'value' : 'ALL_FRIENDS' }");
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _result_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5_ = _result_;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = _ ("Everyone");
+	_tmp5__length1 = _result__length1;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp8_, "{ 'value' : 'EVERYONE' }");
+	_tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Everyone"), "{ 'value' : 'EVERYONE' }");
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = _result_;
+	_tmp7_ = _result_;
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7__length1 = _result__length1;
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (result_length1) {
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		*result_length1 = _tmp10__length1;
-#line 5368 "FacebookPublishing.c"
+		*result_length1 = _tmp7__length1;
+#line 5372 "FacebookPublishing.c"
 	}
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp10_;
+	result = _tmp7_;
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5374 "FacebookPublishing.c"
+#line 5378 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add10 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
+static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 5385 "FacebookPublishing.c"
+#line 5389 "FacebookPublishing.c"
 	}
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 5389 "FacebookPublishing.c"
+#line 5393 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add11 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
+static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 5400 "FacebookPublishing.c"
+#line 5404 "FacebookPublishing.c"
 	}
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 5404 "FacebookPublishing.c"
+#line 5408 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self, int* result_length1) {
 	PublishingFacebookResolution* result = NULL;
 	PublishingFacebookResolution* _result_ = NULL;
-	PublishingFacebookResolution* _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingFacebookResolution* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingFacebookResolution* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PublishingFacebookResolution* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	PublishingFacebookResolution* _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingFacebookResolution* _tmp1_;
+	gint _tmp1__length1;
+	PublishingFacebookResolution* _tmp2_;
+	gint _tmp2__length1;
+	PublishingFacebookResolution* _tmp3_;
+	gint _tmp3__length1;
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5466,39 +5470,39 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
 	if (result_length1) {
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp3__length1;
-#line 5450 "FacebookPublishing.c"
+#line 5454 "FacebookPublishing.c"
 	}
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5456 "FacebookPublishing.c"
+#line 5460 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkButton* _tmp24_ = NULL;
+	gboolean _tmp0_;
+	GtkButton* _tmp24_;
 #line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
 #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 5469 "FacebookPublishing.c"
-		PublishingFacebookAlbum** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
+#line 5473 "FacebookPublishing.c"
+		PublishingFacebookAlbum** _tmp1_;
+		gint _tmp1__length1;
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->albums;
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1__length1 = self->priv->albums_length1;
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp1__length1 == 0) {
-#line 5478 "FacebookPublishing.c"
-			GtkRadioButton* _tmp2_ = NULL;
-			GtkEntry* _tmp3_ = NULL;
-			GtkComboBoxText* _tmp4_ = NULL;
-			GtkRadioButton* _tmp5_ = NULL;
+#line 5482 "FacebookPublishing.c"
+			GtkRadioButton* _tmp2_;
+			GtkEntry* _tmp3_;
+			GtkComboBoxText* _tmp4_;
+			GtkRadioButton* _tmp5_;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = self->priv->create_new_radio;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5515,13 +5519,13 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 			_tmp5_ = self->priv->use_existing_radio;
 #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5499 "FacebookPublishing.c"
+#line 5503 "FacebookPublishing.c"
 		} else {
 			gint default_album_seq_num = 0;
 			gint ticker = 0;
-			PublishingFacebookAlbum** _tmp6_ = NULL;
-			gint _tmp6__length1 = 0;
-			gint _tmp15_ = 0;
+			PublishingFacebookAlbum** _tmp6_;
+			gint _tmp6__length1;
+			gint _tmp15_;
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			default_album_seq_num = -1;
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5530,7 +5534,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 			_tmp6_ = self->priv->albums;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp6__length1 = self->priv->albums_length1;
-#line 5514 "FacebookPublishing.c"
+#line 5518 "FacebookPublishing.c"
 			{
 				PublishingFacebookAlbum** album_collection = NULL;
 				gint album_collection_length1 = 0;
@@ -5542,21 +5546,21 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 				album_collection_length1 = _tmp6__length1;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				for (album_it = 0; album_it < _tmp6__length1; album_it = album_it + 1) {
-#line 5526 "FacebookPublishing.c"
-					PublishingFacebookAlbum* _tmp7_ = NULL;
+#line 5530 "FacebookPublishing.c"
+					PublishingFacebookAlbum* _tmp7_;
 					PublishingFacebookAlbum* album = NULL;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp7_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album = _tmp7_;
-#line 5533 "FacebookPublishing.c"
+#line 5537 "FacebookPublishing.c"
 					{
-						GtkComboBoxText* _tmp8_ = NULL;
-						PublishingFacebookAlbum* _tmp9_ = NULL;
-						const gchar* _tmp10_ = NULL;
-						PublishingFacebookAlbum* _tmp11_ = NULL;
-						const gchar* _tmp12_ = NULL;
-						gint _tmp14_ = 0;
+						GtkComboBoxText* _tmp8_;
+						PublishingFacebookAlbum* _tmp9_;
+						const gchar* _tmp10_;
+						PublishingFacebookAlbum* _tmp11_;
+						const gchar* _tmp12_;
+						gint _tmp14_;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp8_ = self->priv->existing_albums_combo;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5571,13 +5575,13 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 						_tmp12_ = _tmp11_->name;
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						if (g_strcmp0 (_tmp12_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
-#line 5555 "FacebookPublishing.c"
-							gint _tmp13_ = 0;
+#line 5559 "FacebookPublishing.c"
+							gint _tmp13_;
 #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							_tmp13_ = ticker;
 #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							default_album_seq_num = _tmp13_;
-#line 5561 "FacebookPublishing.c"
+#line 5565 "FacebookPublishing.c"
 						}
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp14_ = ticker;
@@ -5585,7 +5589,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 						ticker = _tmp14_ + 1;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_publishing_facebook_album_unref0 (album);
-#line 5569 "FacebookPublishing.c"
+#line 5573 "FacebookPublishing.c"
 					}
 				}
 			}
@@ -5593,11 +5597,11 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 			_tmp15_ = default_album_seq_num;
 #line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp15_ != -1) {
-#line 5577 "FacebookPublishing.c"
-				GtkComboBoxText* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
-				GtkRadioButton* _tmp18_ = NULL;
-				GtkEntry* _tmp19_ = NULL;
+#line 5581 "FacebookPublishing.c"
+				GtkComboBoxText* _tmp16_;
+				gint _tmp17_;
+				GtkRadioButton* _tmp18_;
+				GtkEntry* _tmp19_;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp16_ = self->priv->existing_albums_combo;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5612,12 +5616,12 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 				_tmp19_ = self->priv->new_album_entry;
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5596 "FacebookPublishing.c"
+#line 5600 "FacebookPublishing.c"
 			} else {
-				GtkRadioButton* _tmp20_ = NULL;
-				GtkComboBoxText* _tmp21_ = NULL;
-				GtkComboBoxText* _tmp22_ = NULL;
-				GtkEntry* _tmp23_ = NULL;
+				GtkRadioButton* _tmp20_;
+				GtkComboBoxText* _tmp21_;
+				GtkComboBoxText* _tmp22_;
+				GtkEntry* _tmp23_;
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp20_ = self->priv->create_new_radio;
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5634,7 +5638,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 				_tmp23_ = self->priv->new_album_entry;
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_entry_set_text (_tmp23_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 5618 "FacebookPublishing.c"
+#line 5622 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -5642,7 +5646,7 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 	_tmp24_ = self->priv->publish_button;
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 5626 "FacebookPublishing.c"
+#line 5630 "FacebookPublishing.c"
 }
 
 
@@ -5650,17 +5654,17 @@ static void publishing_facebook_publishing_options_pane_notify_logout (Publishin
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 5635 "FacebookPublishing.c"
+	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 5639 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingFacebookResolution _tmp2_ = 0;
-	GtkCheckButton* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingFacebookResolution _tmp2_;
+	GtkCheckButton* _tmp3_;
+	gboolean _tmp4_;
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5676,16 +5680,16 @@ static void publishing_facebook_publishing_options_pane_notify_publish (Publishi
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit_by_name (self, "publish", _tmp0_, _tmp1_, _tmp2_, _tmp4_);
-#line 5661 "FacebookPublishing.c"
+	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp4_);
+#line 5665 "FacebookPublishing.c"
 }
 
 
 static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5696,7 +5700,7 @@ static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (S
 	result = _tmp1_;
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5680 "FacebookPublishing.c"
+#line 5684 "FacebookPublishing.c"
 }
 
 
@@ -5709,21 +5713,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_op
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5693 "FacebookPublishing.c"
+#line 5697 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
 #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_logout ((PublishingFacebookPublishingOptionsPane*) self);
-#line 5700 "FacebookPublishing.c"
+#line 5704 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_publish ((PublishingFacebookPublishingOptionsPane*) self, target_album, privacy_setting, target_resolution);
-#line 5707 "FacebookPublishing.c"
+#line 5711 "FacebookPublishing.c"
 }
 
 
@@ -5737,14 +5741,14 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_installed (
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
 #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_installed (self);
-#line 5721 "FacebookPublishing.c"
+#line 5725 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
 #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5755,7 +5759,7 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
 #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 5739 "FacebookPublishing.c"
+#line 5743 "FacebookPublishing.c"
 }
 
 
@@ -5774,28 +5778,28 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure *
 		data1 = closure->data;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 5758 "FacebookPublishing.c"
+#line 5762 "FacebookPublishing.c"
 	} else {
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 5764 "FacebookPublishing.c"
+#line 5768 "FacebookPublishing.c"
 	}
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_enum (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 5770 "FacebookPublishing.c"
+#line 5774 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5820,21 +5824,21 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_fac
 	self->privacy_setting = _tmp3_;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 5804 "FacebookPublishing.c"
+#line 5808 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting) {
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_options_pane_privacy_description_construct (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 5811 "FacebookPublishing.c"
+#line 5815 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5818 "FacebookPublishing.c"
+#line 5822 "FacebookPublishing.c"
 }
 
 
@@ -5843,7 +5847,7 @@ static void publishing_facebook_publishing_options_pane_value_privacy_descriptio
 	if (value->data[0].v_pointer) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 5827 "FacebookPublishing.c"
+#line 5831 "FacebookPublishing.c"
 	}
 }
 
@@ -5853,11 +5857,11 @@ static void publishing_facebook_publishing_options_pane_value_privacy_descriptio
 	if (src_value->data[0].v_pointer) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 5837 "FacebookPublishing.c"
+#line 5841 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5841 "FacebookPublishing.c"
+#line 5845 "FacebookPublishing.c"
 	}
 }
 
@@ -5865,66 +5869,66 @@ static void publishing_facebook_publishing_options_pane_value_privacy_descriptio
 static gpointer publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5849 "FacebookPublishing.c"
+#line 5853 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5856 "FacebookPublishing.c"
-		PublishingFacebookPublishingOptionsPanePrivacyDescription* object;
+#line 5860 "FacebookPublishing.c"
+		PublishingFacebookPublishingOptionsPanePrivacyDescription * object;
 		object = collect_values[0].v_pointer;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5863 "FacebookPublishing.c"
+#line 5867 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5867 "FacebookPublishing.c"
+#line 5871 "FacebookPublishing.c"
 		}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (object);
-#line 5871 "FacebookPublishing.c"
+#line 5875 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5875 "FacebookPublishing.c"
+#line 5879 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 5879 "FacebookPublishing.c"
+#line 5883 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** object_p;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5890 "FacebookPublishing.c"
+#line 5894 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 5896 "FacebookPublishing.c"
+#line 5900 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5900 "FacebookPublishing.c"
+#line 5904 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 5904 "FacebookPublishing.c"
+#line 5908 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 5908 "FacebookPublishing.c"
+#line 5912 "FacebookPublishing.c"
 }
 
 
@@ -5938,7 +5942,7 @@ static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privac
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 5922 "FacebookPublishing.c"
+#line 5926 "FacebookPublishing.c"
 }
 
 
@@ -5947,12 +5951,12 @@ static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_de
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5931 "FacebookPublishing.c"
+#line 5935 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription * old;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5967,23 +5971,23 @@ static void publishing_facebook_publishing_options_pane_value_set_privacy_descri
 		value->data[0].v_pointer = v_object;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 5951 "FacebookPublishing.c"
+#line 5955 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5955 "FacebookPublishing.c"
+#line 5959 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 5961 "FacebookPublishing.c"
+#line 5965 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription * old;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5996,17 +6000,17 @@ static void publishing_facebook_publishing_options_pane_value_take_privacy_descr
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 5980 "FacebookPublishing.c"
+#line 5984 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5984 "FacebookPublishing.c"
+#line 5988 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 5990 "FacebookPublishing.c"
+#line 5994 "FacebookPublishing.c"
 	}
 }
 
@@ -6016,18 +6020,18 @@ static void publishing_facebook_publishing_options_pane_privacy_description_clas
 	publishing_facebook_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_facebook_publishing_options_pane_privacy_description_finalize;
-#line 6000 "FacebookPublishing.c"
+#line 6004 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 6007 "FacebookPublishing.c"
+#line 6011 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription* obj) {
+static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingFacebookPublishingOptionsPanePrivacyDescription);
@@ -6037,7 +6041,7 @@ static void publishing_facebook_publishing_options_pane_privacy_description_fina
 	_g_free0 (self->description);
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 6021 "FacebookPublishing.c"
+#line 6025 "FacebookPublishing.c"
 }
 
 
@@ -6056,18 +6060,18 @@ static GType publishing_facebook_publishing_options_pane_privacy_description_get
 
 
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance) {
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* self;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 6046 "FacebookPublishing.c"
+#line 6050 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance) {
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* self;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -6075,7 +6079,7 @@ static void publishing_facebook_publishing_options_pane_privacy_description_unre
 		PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6059 "FacebookPublishing.c"
+#line 6063 "FacebookPublishing.c"
 	}
 }
 
@@ -6088,10 +6092,10 @@ static void publishing_facebook_publishing_options_pane_class_init (PublishingFa
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_publishing_options_pane_finalize;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, PUBLISHING_FACEBOOK_TYPE_RESOLUTION, G_TYPE_BOOLEAN);
-#line 6075 "FacebookPublishing.c"
+	publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, PUBLISHING_FACEBOOK_TYPE_RESOLUTION, G_TYPE_BOOLEAN);
+#line 6079 "FacebookPublishing.c"
 }
 
 
@@ -6099,14 +6103,14 @@ static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_p
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_get_widget;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_get_preferred_geometry;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_on_pane_installed;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_uninstalled;
-#line 6090 "FacebookPublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_on_pane_uninstalled;
+#line 6094 "FacebookPublishing.c"
 }
 
 
@@ -6143,11 +6147,11 @@ static void publishing_facebook_publishing_options_pane_instance_init (Publishin
 	self->priv->publisher = NULL;
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->resolution_combo = NULL;
-#line 6127 "FacebookPublishing.c"
+#line 6131 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_finalize (GObject* obj) {
+static void publishing_facebook_publishing_options_pane_finalize (GObject * obj) {
 	PublishingFacebookPublishingOptionsPane * self;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
@@ -6185,7 +6189,7 @@ static void publishing_facebook_publishing_options_pane_finalize (GObject* obj)
 	_g_object_unref0 (self->priv->resolution_combo);
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_publishing_options_pane_parent_class)->finalize (obj);
-#line 6169 "FacebookPublishing.c"
+#line 6173 "FacebookPublishing.c"
 }
 
 
@@ -6209,48 +6213,48 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
 	switch (self) {
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT:
-#line 6193 "FacebookPublishing.c"
+#line 6197 "FacebookPublishing.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp0_ = g_strdup ("https://graph.facebook.com/");
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp0_;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 6202 "FacebookPublishing.c"
+#line 6206 "FacebookPublishing.c"
 		}
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_VIDEO:
-#line 6206 "FacebookPublishing.c"
+#line 6210 "FacebookPublishing.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = g_strdup ("https://graph-video.facebook.com/");
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp1_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 6215 "FacebookPublishing.c"
+#line 6219 "FacebookPublishing.c"
 		}
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION:
-#line 6219 "FacebookPublishing.c"
+#line 6223 "FacebookPublishing.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = g_strdup ("https://www.facebook.com/");
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp2_;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 6228 "FacebookPublishing.c"
+#line 6232 "FacebookPublishing.c"
 		}
 		default:
 		{
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_assert_not_reached ();
-#line 6234 "FacebookPublishing.c"
+#line 6238 "FacebookPublishing.c"
 		}
 	}
 }
@@ -6273,7 +6277,7 @@ static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebook
 	g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_uri'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6257 "FacebookPublishing.c"
+#line 6261 "FacebookPublishing.c"
 }
 
 
@@ -6282,7 +6286,7 @@ gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_uri (self);
-#line 6266 "FacebookPublishing.c"
+#line 6270 "FacebookPublishing.c"
 }
 
 
@@ -6291,7 +6295,7 @@ static gchar* publishing_facebook_graph_message_real_get_response_body (Publishi
 	g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_response_body'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6275 "FacebookPublishing.c"
+#line 6279 "FacebookPublishing.c"
 }
 
 
@@ -6300,7 +6304,7 @@ gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGr
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
 #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_response_body (self);
-#line 6284 "FacebookPublishing.c"
+#line 6288 "FacebookPublishing.c"
 }
 
 
@@ -6310,7 +6314,7 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GTy
 	self = (PublishingFacebookGraphMessage*) g_type_create_instance (object_type);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 6294 "FacebookPublishing.c"
+#line 6298 "FacebookPublishing.c"
 }
 
 
@@ -6329,26 +6333,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 		data1 = closure->data;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 6313 "FacebookPublishing.c"
+#line 6317 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 6319 "FacebookPublishing.c"
+#line 6323 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 6325 "FacebookPublishing.c"
+#line 6329 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_message_init (GValue* value) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6332 "FacebookPublishing.c"
+#line 6336 "FacebookPublishing.c"
 }
 
 
@@ -6357,7 +6361,7 @@ static void publishing_facebook_value_graph_message_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (value->data[0].v_pointer);
-#line 6341 "FacebookPublishing.c"
+#line 6345 "FacebookPublishing.c"
 	}
 }
 
@@ -6367,11 +6371,11 @@ static void publishing_facebook_value_graph_message_copy_value (const GValue* sr
 	if (src_value->data[0].v_pointer) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_graph_message_ref (src_value->data[0].v_pointer);
-#line 6351 "FacebookPublishing.c"
+#line 6355 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6355 "FacebookPublishing.c"
+#line 6359 "FacebookPublishing.c"
 	}
 }
 
@@ -6379,66 +6383,66 @@ static void publishing_facebook_value_graph_message_copy_value (const GValue* sr
 static gpointer publishing_facebook_value_graph_message_peek_pointer (const GValue* value) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6363 "FacebookPublishing.c"
+#line 6367 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6370 "FacebookPublishing.c"
-		PublishingFacebookGraphMessage* object;
+#line 6374 "FacebookPublishing.c"
+		PublishingFacebookGraphMessage * object;
 		object = collect_values[0].v_pointer;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6377 "FacebookPublishing.c"
+#line 6381 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6381 "FacebookPublishing.c"
+#line 6385 "FacebookPublishing.c"
 		}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_message_ref (object);
-#line 6385 "FacebookPublishing.c"
+#line 6389 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6389 "FacebookPublishing.c"
+#line 6393 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6393 "FacebookPublishing.c"
+#line 6397 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_message_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFacebookGraphMessage** object_p;
+	PublishingFacebookGraphMessage ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6404 "FacebookPublishing.c"
+#line 6408 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 6410 "FacebookPublishing.c"
+#line 6414 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6414 "FacebookPublishing.c"
+#line 6418 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 6418 "FacebookPublishing.c"
+#line 6422 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6422 "FacebookPublishing.c"
+#line 6426 "FacebookPublishing.c"
 }
 
 
@@ -6452,7 +6456,7 @@ GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6436 "FacebookPublishing.c"
+#line 6440 "FacebookPublishing.c"
 }
 
 
@@ -6461,12 +6465,12 @@ gpointer publishing_facebook_value_get_graph_message (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6445 "FacebookPublishing.c"
+#line 6449 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object) {
-	PublishingFacebookGraphMessage* old;
+	PublishingFacebookGraphMessage * old;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6481,23 +6485,23 @@ void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 6465 "FacebookPublishing.c"
+#line 6469 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6469 "FacebookPublishing.c"
+#line 6473 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 6475 "FacebookPublishing.c"
+#line 6479 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object) {
-	PublishingFacebookGraphMessage* old;
+	PublishingFacebookGraphMessage * old;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6510,17 +6514,17 @@ void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6494 "FacebookPublishing.c"
+#line 6498 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6498 "FacebookPublishing.c"
+#line 6502 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 6504 "FacebookPublishing.c"
+#line 6508 "FacebookPublishing.c"
 	}
 }
 
@@ -6531,33 +6535,33 @@ static void publishing_facebook_graph_message_class_init (PublishingFacebookGrap
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_message_finalize;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_message_real_get_uri;
+	((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_message_real_get_uri;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_message_real_get_response_body;
+	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_message_real_get_response_body;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL] = g_signal_new ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+	publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL] = g_signal_new ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("data_transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-#line 6524 "FacebookPublishing.c"
+	publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL] = g_signal_new ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+#line 6528 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 6531 "FacebookPublishing.c"
+#line 6535 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage* obj) {
+static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj) {
 	PublishingFacebookGraphMessage * self;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 6541 "FacebookPublishing.c"
+#line 6545 "FacebookPublishing.c"
 }
 
 
@@ -6576,18 +6580,18 @@ GType publishing_facebook_graph_message_get_type (void) {
 
 
 gpointer publishing_facebook_graph_message_ref (gpointer instance) {
-	PublishingFacebookGraphMessage* self;
+	PublishingFacebookGraphMessage * self;
 	self = instance;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 6566 "FacebookPublishing.c"
+#line 6570 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_message_unref (gpointer instance) {
-	PublishingFacebookGraphMessage* self;
+	PublishingFacebookGraphMessage * self;
 	self = instance;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -6595,7 +6599,7 @@ void publishing_facebook_graph_message_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->finalize (self);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6579 "FacebookPublishing.c"
+#line 6583 "FacebookPublishing.c"
 	}
 }
 
@@ -6603,16 +6607,16 @@ void publishing_facebook_graph_message_unref (gpointer instance) {
 static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
 #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_on_request_unqueued ((PublishingFacebookGraphSession*) self, msg);
-#line 6587 "FacebookPublishing.c"
+#line 6591 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type) {
 	PublishingFacebookGraphSession* self = NULL;
-	SoupSession* _tmp0_ = NULL;
-	SoupSession* _tmp1_ = NULL;
-	SoupSession* _tmp2_ = NULL;
-	SoupSession* _tmp3_ = NULL;
+	SoupSession* _tmp0_;
+	SoupSession* _tmp1_;
+	SoupSession* _tmp2_;
+	SoupSession* _tmp3_;
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSession*) g_type_create_instance (object_type);
 #line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6643,28 +6647,28 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GTy
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 6627 "FacebookPublishing.c"
+#line 6631 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void) {
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_construct (PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION);
-#line 6634 "FacebookPublishing.c"
+#line 6638 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_message_ref0 (gpointer self) {
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_message_ref (self) : NULL;
-#line 6641 "FacebookPublishing.c"
+#line 6645 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	PublishingFacebookGraphMessage* _tmp1_ = NULL;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	PublishingFacebookGraphMessage* _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
 #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6681,12 +6685,12 @@ static void publishing_facebook_graph_session_manage_message (PublishingFacebook
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = _tmp2_;
-#line 6665 "FacebookPublishing.c"
+#line 6669 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
 #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6699,40 +6703,40 @@ static void publishing_facebook_graph_session_unmanage_message (PublishingFacebo
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
 #line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 6683 "FacebookPublishing.c"
+#line 6687 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
 #line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data ((PublishingFacebookGraphSessionGraphMessageImpl*) self, chunk);
-#line 6690 "FacebookPublishing.c"
+#line 6694 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self, SoupMessage* msg) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
 	PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL;
-	PublishingFacebookGraphMessage* _tmp1_ = NULL;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_ = NULL;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp3_ = NULL;
-	SoupMessage* _tmp4_ = NULL;
-	SoupMessage* _tmp5_ = NULL;
+	PublishingFacebookGraphMessage* _tmp1_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp3_;
+	SoupMessage* _tmp4_;
+	SoupMessage* _tmp5_;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-	SoupMessage* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	guint _tmp10_ = 0U;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp21_ = NULL;
-	SoupMessage* _tmp22_ = NULL;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp23_ = NULL;
-	guint _tmp24_ = 0U;
+	SoupMessage* _tmp8_;
+	guint _tmp9_;
+	guint _tmp10_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp21_;
+	SoupMessage* _tmp22_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp23_;
+	guint _tmp24_;
 	GError* _error_ = NULL;
-	SoupMessage* _tmp25_ = NULL;
-	guint _tmp26_ = 0U;
-	guint _tmp27_ = 0U;
-	GError* _tmp68_ = NULL;
-	GError* _tmp80_ = NULL;
+	SoupMessage* _tmp25_;
+	guint _tmp26_;
+	guint _tmp27_;
+	GError* _tmp68_;
+	GError* _tmp80_;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6765,11 +6769,11 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 	if (_tmp10_ == ((guint) SOUP_STATUS_IO_ERROR)) {
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = TRUE;
-#line 6749 "FacebookPublishing.c"
+#line 6753 "FacebookPublishing.c"
 	} else {
-		SoupMessage* _tmp11_ = NULL;
-		guint _tmp12_ = 0U;
-		guint _tmp13_ = 0U;
+		SoupMessage* _tmp11_;
+		guint _tmp12_;
+		guint _tmp13_;
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = msg;
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6778,17 +6782,17 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 		_tmp13_ = _tmp12_;
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp13_ == ((guint) SOUP_STATUS_MALFORMED);
-#line 6762 "FacebookPublishing.c"
+#line 6766 "FacebookPublishing.c"
 	}
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_) {
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 6768 "FacebookPublishing.c"
+#line 6772 "FacebookPublishing.c"
 	} else {
-		SoupMessage* _tmp14_ = NULL;
-		guint _tmp15_ = 0U;
-		guint _tmp16_ = 0U;
+		SoupMessage* _tmp14_;
+		guint _tmp15_;
+		guint _tmp16_;
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = msg;
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6797,15 +6801,15 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 		_tmp16_ = _tmp15_;
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp16_ == ((guint) SOUP_STATUS_TRY_AGAIN);
-#line 6781 "FacebookPublishing.c"
+#line 6785 "FacebookPublishing.c"
 	}
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 6785 "FacebookPublishing.c"
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_ = NULL;
-		SoupSession* _tmp18_ = NULL;
-		SoupMessage* _tmp19_ = NULL;
-		SoupMessage* _tmp20_ = NULL;
+#line 6789 "FacebookPublishing.c"
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_;
+		SoupSession* _tmp18_;
+		SoupMessage* _tmp19_;
+		SoupMessage* _tmp20_;
 #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = real_message;
 #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6822,7 +6826,7 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 		_publishing_facebook_graph_message_unref0 (real_message);
 #line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 6806 "FacebookPublishing.c"
+#line 6810 "FacebookPublishing.c"
 	}
 #line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = real_message;
@@ -6850,17 +6854,17 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 		case SOUP_STATUS_OK:
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CREATED:
-#line 6834 "FacebookPublishing.c"
+#line 6838 "FacebookPublishing.c"
 		{
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6838 "FacebookPublishing.c"
+#line 6842 "FacebookPublishing.c"
 		}
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE:
-#line 6842 "FacebookPublishing.c"
+#line 6846 "FacebookPublishing.c"
 		{
-			GError* _tmp28_ = NULL;
+			GError* _tmp28_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp28_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, "OAuth Access Token has Expired. Logout user.");
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6869,21 +6873,21 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			_error_ = _tmp28_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6853 "FacebookPublishing.c"
+#line 6857 "FacebookPublishing.c"
 		}
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 6859 "FacebookPublishing.c"
+#line 6863 "FacebookPublishing.c"
 		{
-			PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			SoupMessage* _tmp32_ = NULL;
-			guint _tmp33_ = 0U;
-			guint _tmp34_ = 0U;
-			GError* _tmp35_ = NULL;
+			PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_;
+			gchar* _tmp30_;
+			gchar* _tmp31_;
+			SoupMessage* _tmp32_;
+			guint _tmp33_;
+			guint _tmp34_;
+			GError* _tmp35_;
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp29_ = real_message;
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6906,21 +6910,21 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			_g_free0 (_tmp31_);
 #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6890 "FacebookPublishing.c"
+#line 6894 "FacebookPublishing.c"
 		}
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT:
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 6896 "FacebookPublishing.c"
+#line 6900 "FacebookPublishing.c"
 		{
-			PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-			gchar* _tmp38_ = NULL;
-			SoupMessage* _tmp39_ = NULL;
-			guint _tmp40_ = 0U;
-			guint _tmp41_ = 0U;
-			GError* _tmp42_ = NULL;
+			PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_;
+			gchar* _tmp37_;
+			gchar* _tmp38_;
+			SoupMessage* _tmp39_;
+			guint _tmp40_;
+			guint _tmp41_;
+			GError* _tmp42_;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp36_ = real_message;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6943,13 +6947,13 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			_g_free0 (_tmp38_);
 #line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6927 "FacebookPublishing.c"
+#line 6931 "FacebookPublishing.c"
 		}
 		default:
 		{
-			SoupMessage* _tmp43_ = NULL;
-			guint _tmp44_ = 0U;
-			guint _tmp45_ = 0U;
+			SoupMessage* _tmp43_;
+			guint _tmp44_;
+			guint _tmp45_;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp43_ = msg;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6958,18 +6962,18 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			_tmp45_ = _tmp44_;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp45_ >= ((guint) 100)) {
-#line 6942 "FacebookPublishing.c"
-				PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_ = NULL;
-				gchar* _tmp47_ = NULL;
-				gchar* _tmp48_ = NULL;
-				SoupMessage* _tmp49_ = NULL;
-				guint _tmp50_ = 0U;
-				guint _tmp51_ = 0U;
-				SoupMessage* _tmp52_ = NULL;
-				gchar* _tmp53_ = NULL;
-				gchar* _tmp54_ = NULL;
-				gchar* _tmp55_ = NULL;
-				GError* _tmp56_ = NULL;
+#line 6946 "FacebookPublishing.c"
+				PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_;
+				gchar* _tmp47_;
+				gchar* _tmp48_;
+				SoupMessage* _tmp49_;
+				guint _tmp50_;
+				guint _tmp51_;
+				SoupMessage* _tmp52_;
+				gchar* _tmp53_;
+				gchar* _tmp54_;
+				gchar* _tmp55_;
+				GError* _tmp56_;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp46_ = real_message;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7000,19 +7004,19 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				_g_free0 (_tmp55_);
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp48_);
-#line 6984 "FacebookPublishing.c"
+#line 6988 "FacebookPublishing.c"
 			} else {
-				SoupMessage* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				gchar* _tmp59_ = NULL;
-				gchar* _tmp60_ = NULL;
-				PublishingFacebookGraphSessionGraphMessageImpl* _tmp61_ = NULL;
-				gchar* _tmp62_ = NULL;
-				gchar* _tmp63_ = NULL;
-				SoupMessage* _tmp64_ = NULL;
-				guint _tmp65_ = 0U;
-				guint _tmp66_ = 0U;
-				GError* _tmp67_ = NULL;
+				SoupMessage* _tmp57_;
+				gchar* _tmp58_;
+				gchar* _tmp59_;
+				gchar* _tmp60_;
+				PublishingFacebookGraphSessionGraphMessageImpl* _tmp61_;
+				gchar* _tmp62_;
+				gchar* _tmp63_;
+				SoupMessage* _tmp64_;
+				guint _tmp65_;
+				guint _tmp66_;
+				GError* _tmp67_;
 #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp57_ = msg;
 #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7045,23 +7049,23 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				_error_ = _tmp67_;
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp63_);
-#line 7029 "FacebookPublishing.c"
+#line 7033 "FacebookPublishing.c"
 			}
 #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 7033 "FacebookPublishing.c"
+#line 7037 "FacebookPublishing.c"
 		}
 	}
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp68_ = _error_;
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp68_ == NULL) {
-#line 7040 "FacebookPublishing.c"
+#line 7044 "FacebookPublishing.c"
 		gboolean _tmp69_ = FALSE;
-		SoupMessage* _tmp70_ = NULL;
-		SoupMessageBody* _tmp71_ = NULL;
-		guint8* _tmp72_ = NULL;
-		gint _tmp72__length1 = 0;
+		SoupMessage* _tmp70_;
+		SoupMessageBody* _tmp71_;
+		guint8* _tmp72_;
+		gint _tmp72__length1;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp70_ = msg;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7074,12 +7078,12 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 		if (_tmp72_ == NULL) {
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = TRUE;
-#line 7058 "FacebookPublishing.c"
+#line 7062 "FacebookPublishing.c"
 		} else {
-			SoupMessage* _tmp73_ = NULL;
-			SoupMessageBody* _tmp74_ = NULL;
-			guint8* _tmp75_ = NULL;
-			gint _tmp75__length1 = 0;
+			SoupMessage* _tmp73_;
+			SoupMessageBody* _tmp74_;
+			guint8* _tmp75_;
+			gint _tmp75__length1;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp73_ = msg;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7090,15 +7094,15 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			_tmp75__length1 = (gint) _tmp74_->length;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = _tmp75__length1 == 0;
-#line 7074 "FacebookPublishing.c"
+#line 7078 "FacebookPublishing.c"
 		}
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp69_) {
-#line 7078 "FacebookPublishing.c"
-			PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_ = NULL;
-			gchar* _tmp77_ = NULL;
-			gchar* _tmp78_ = NULL;
-			GError* _tmp79_ = NULL;
+#line 7082 "FacebookPublishing.c"
+			PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_;
+			gchar* _tmp77_;
+			gchar* _tmp78_;
+			GError* _tmp79_;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp76_ = real_message;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7113,42 +7117,42 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			_error_ = _tmp79_;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp78_);
-#line 7097 "FacebookPublishing.c"
+#line 7101 "FacebookPublishing.c"
 		}
 	}
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = _error_;
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp80_ == NULL) {
-#line 7104 "FacebookPublishing.c"
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_ = NULL;
+#line 7108 "FacebookPublishing.c"
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_;
 #line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp81_ = real_message;
 #line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "completed");
-#line 7110 "FacebookPublishing.c"
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL], 0);
+#line 7114 "FacebookPublishing.c"
 	} else {
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_ = NULL;
-		GError* _tmp83_ = NULL;
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_;
+		GError* _tmp83_;
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp82_ = real_message;
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp83_ = _error_;
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp83_);
-#line 7120 "FacebookPublishing.c"
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp83_);
+#line 7124 "FacebookPublishing.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_error_free0 (_error_);
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 7126 "FacebookPublishing.c"
+#line 7130 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7162,14 +7166,14 @@ void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSess
 #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->access_token = _tmp1_;
 #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit_by_name (self, "authenticated");
-#line 7147 "FacebookPublishing.c"
+	g_signal_emit (self, publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL], 0);
+#line 7151 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), FALSE);
 #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7178,15 +7182,15 @@ gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookG
 	result = _tmp0_ != NULL;
 #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7162 "FacebookPublishing.c"
+#line 7166 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self, const gchar* resource_path) {
 	PublishingFacebookGraphMessage* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_;
 #line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
 #line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7201,18 +7205,18 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (Pub
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7185 "FacebookPublishing.c"
+#line 7189 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self, const gchar* resource_path, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
 	PublishingFacebookGraphMessage* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	gboolean _tmp3_;
+	const gchar* _tmp4_;
+	PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_;
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7235,16 +7239,16 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (Pu
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7219 "FacebookPublishing.c"
+#line 7223 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self, const gchar* album_name, const gchar* privacy) {
 	PublishingFacebookGraphMessage* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_;
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7263,24 +7267,24 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_alb
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7247 "FacebookPublishing.c"
+#line 7251 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message) {
 	PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL;
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp1_ = NULL;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_ = NULL;
-	SoupMessage* _tmp3_ = NULL;
-	SoupURI* _tmp4_ = NULL;
-	SoupURI* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	PublishingFacebookGraphMessage* _tmp0_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp1_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_;
+	SoupMessage* _tmp3_;
+	SoupURI* _tmp4_;
+	SoupURI* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_;
+	gboolean _tmp11_;
 #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7319,12 +7323,12 @@ void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSess
 	_tmp11_ = publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp10_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp11_) {
-#line 7303 "FacebookPublishing.c"
-		PublishingFacebookGraphMessage* _tmp12_ = NULL;
-		SoupSession* _tmp13_ = NULL;
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_ = NULL;
-		SoupMessage* _tmp15_ = NULL;
-		SoupMessage* _tmp16_ = NULL;
+#line 7307 "FacebookPublishing.c"
+		PublishingFacebookGraphMessage* _tmp12_;
+		SoupSession* _tmp13_;
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_;
+		SoupMessage* _tmp15_;
+		SoupMessage* _tmp16_;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = message;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7339,35 +7343,35 @@ void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSess
 		_tmp16_ = _g_object_ref0 (_tmp15_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_session_queue_message (_tmp13_, _tmp16_, NULL, NULL);
-#line 7323 "FacebookPublishing.c"
+#line 7327 "FacebookPublishing.c"
 	}
 #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 7327 "FacebookPublishing.c"
+#line 7331 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self) {
-	SoupSession* _tmp0_ = NULL;
+	SoupSession* _tmp0_;
 #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->soup_session;
 #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_session_abort (_tmp0_);
-#line 7339 "FacebookPublishing.c"
+#line 7343 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type, PublishingFacebookGraphSession* host_session, PublishingRESTSupportHttpMethod method, const gchar* relative_uri, const gchar* access_token, PublishingFacebookEndpoint endpoint) {
 	PublishingFacebookGraphSessionGraphMessageImpl* self = NULL;
-	PublishingRESTSupportHttpMethod _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
+	PublishingRESTSupportHttpMethod _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingFacebookGraphSession* _tmp3_;
 	gchar* endpoint_uri = NULL;
-	PublishingFacebookEndpoint _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
+	PublishingFacebookEndpoint _tmp4_;
+	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
@@ -7401,18 +7405,16 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 	_tmp5_ = publishing_facebook_endpoint_to_uri (_tmp4_);
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	endpoint_uri = _tmp5_;
-#line 7385 "FacebookPublishing.c"
+#line 7389 "FacebookPublishing.c"
 	{
 		GRegex* starting_slashes = NULL;
-		GRegex* _tmp6_ = NULL;
+		GRegex* _tmp6_;
 		gchar* _tmp7_ = NULL;
-		GRegex* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+		GRegex* _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gchar* _tmp12_;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7421,7 +7423,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7405 "FacebookPublishing.c"
+#line 7407 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7432,7 +7434,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 			g_clear_error (&_inner_error_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 7416 "FacebookPublishing.c"
+#line 7418 "FacebookPublishing.c"
 		}
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = starting_slashes;
@@ -7448,7 +7450,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 			_g_regex_unref0 (starting_slashes);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7432 "FacebookPublishing.c"
+#line 7434 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7461,29 +7463,21 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 			g_clear_error (&_inner_error_);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 7445 "FacebookPublishing.c"
+#line 7447 "FacebookPublishing.c"
 		}
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = endpoint_uri;
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = _tmp7_;
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = _tmp12_;
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = g_strconcat (_tmp11_, _tmp13_, NULL);
+		_tmp12_ = g_strconcat (_tmp11_, _tmp7_, NULL);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->uri);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		self->uri = _tmp14_;
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (_tmp13_);
+		self->uri = _tmp12_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp7_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_regex_unref0 (starting_slashes);
-#line 7467 "FacebookPublishing.c"
+#line 7461 "FacebookPublishing.c"
 	}
 	goto __finally4;
 	__catch4_g_regex_error:
@@ -7497,7 +7491,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		g_assert_not_reached ();
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (err);
-#line 7481 "FacebookPublishing.c"
+#line 7475 "FacebookPublishing.c"
 	}
 	__finally4:
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7510,13 +7504,13 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		g_clear_error (&_inner_error_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 7494 "FacebookPublishing.c"
+#line 7488 "FacebookPublishing.c"
 	}
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (endpoint_uri);
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7500 "FacebookPublishing.c"
+#line 7494 "FacebookPublishing.c"
 }
 
 
@@ -7526,7 +7520,7 @@ static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepar
 	result = TRUE;
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7510 "FacebookPublishing.c"
+#line 7504 "FacebookPublishing.c"
 }
 
 
@@ -7535,15 +7529,15 @@ gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transm
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self), FALSE);
 #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_MESSAGE_IMPL_GET_CLASS (self)->prepare_for_transmission (self);
-#line 7519 "FacebookPublishing.c"
+#line 7513 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base) {
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
 #line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7554,18 +7548,18 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri
 	result = _tmp1_;
 #line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7538 "FacebookPublishing.c"
+#line 7532 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base) {
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
 	gchar* result = NULL;
-	SoupMessage* _tmp0_ = NULL;
-	SoupMessageBody* _tmp1_ = NULL;
-	guint8* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gchar* _tmp3_ = NULL;
+	SoupMessage* _tmp0_;
+	SoupMessageBody* _tmp1_;
+	guint8* _tmp2_;
+	gint _tmp2__length1;
+	gchar* _tmp3_;
 #line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7582,18 +7576,18 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_resp
 	result = _tmp3_;
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7566 "FacebookPublishing.c"
+#line 7560 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self, SoupBuffer* chunk) {
-	gint _tmp0_ = 0;
-	SoupBuffer* _tmp1_ = NULL;
-	gsize _tmp2_ = 0UL;
-	gint _tmp3_ = 0;
-	SoupMessage* _tmp4_ = NULL;
-	SoupMessageBody* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
+	gint _tmp0_;
+	SoupBuffer* _tmp1_;
+	gsize _tmp2_;
+	gint _tmp3_;
+	SoupMessage* _tmp4_;
+	SoupMessageBody* _tmp5_;
+	gint64 _tmp6_;
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self));
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7615,8 +7609,8 @@ static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_d
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->length;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "data-transmitted", _tmp3_, (gint) _tmp6_);
-#line 7600 "FacebookPublishing.c"
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_);
+#line 7594 "FacebookPublishing.c"
 }
 
 
@@ -7626,12 +7620,12 @@ static void publishing_facebook_graph_session_graph_message_impl_class_init (Pub
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_message_impl_finalize;
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*)(PublishingFacebookGraphSessionGraphMessageImpl*)) publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission;
+	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*) (PublishingFacebookGraphSessionGraphMessageImpl *)) publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission;
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_session_graph_message_impl_real_get_uri;
+	((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_uri;
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_session_graph_message_impl_real_get_response_body;
-#line 7615 "FacebookPublishing.c"
+	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_response_body;
+#line 7609 "FacebookPublishing.c"
 }
 
 
@@ -7639,7 +7633,7 @@ static void publishing_facebook_graph_session_graph_message_impl_instance_init (
 }
 
 
-static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage* obj) {
+static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj) {
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
@@ -7651,7 +7645,7 @@ static void publishing_facebook_graph_session_graph_message_impl_finalize (Publi
 	_g_object_unref0 (self->soup_message);
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_message_impl_parent_class)->finalize (obj);
-#line 7635 "FacebookPublishing.c"
+#line 7629 "FacebookPublishing.c"
 }
 
 
@@ -7670,29 +7664,29 @@ static GType publishing_facebook_graph_session_graph_message_impl_get_type (void
 static void _vala_SoupURI_free (SoupURI* self) {
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 7654 "FacebookPublishing.c"
+#line 7648 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) {
 	PublishingFacebookGraphSessionGraphQueryMessage* self = NULL;
-	PublishingFacebookGraphSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	PublishingFacebookGraphSession* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 	SoupURI* destination_uri = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	SoupURI* _tmp9_ = NULL;
-	SoupURI* _tmp10_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp11_ = 0;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	SoupMessage* _tmp14_ = NULL;
-	SoupMessage* _tmp15_ = NULL;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	SoupURI* _tmp9_;
+	SoupURI* _tmp10_;
+	PublishingRESTSupportHttpMethod _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	SoupMessage* _tmp14_;
+	SoupMessage* _tmp15_;
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7751,21 +7745,21 @@ static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_grap
 	__vala_SoupURI_free0 (destination_uri);
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7735 "FacebookPublishing.c"
+#line 7729 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) {
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_query_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, host_session, relative_uri, access_token);
-#line 7742 "FacebookPublishing.c"
+#line 7736 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass) {
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_query_message_parent_class = g_type_class_peek_parent (klass);
-#line 7749 "FacebookPublishing.c"
+#line 7743 "FacebookPublishing.c"
 }
 
 
@@ -7787,15 +7781,15 @@ static GType publishing_facebook_graph_session_graph_query_message_get_type (voi
 
 static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session) {
 	PublishingFacebookGraphSessionGraphEndpointProbeMessage* self = NULL;
-	PublishingFacebookGraphSession* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	SoupURI* _tmp5_ = NULL;
-	SoupURI* _tmp6_ = NULL;
-	SoupMessage* _tmp7_ = NULL;
-	SoupMessage* _tmp8_ = NULL;
+	PublishingFacebookGraphSession* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	SoupURI* _tmp5_;
+	SoupURI* _tmp6_;
+	SoupMessage* _tmp7_;
+	SoupMessage* _tmp8_;
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
 #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7830,21 +7824,21 @@ static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_faceb
 	g_signal_connect (_tmp8_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7814 "FacebookPublishing.c"
+#line 7808 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session) {
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_endpoint_probe_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, host_session);
-#line 7821 "FacebookPublishing.c"
+#line 7815 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass) {
 #line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_endpoint_probe_message_parent_class = g_type_class_peek_parent (klass);
-#line 7828 "FacebookPublishing.c"
+#line 7822 "FacebookPublishing.c"
 }
 
 
@@ -7866,101 +7860,101 @@ static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_
 
 static gchar* g_date_time_to_string (GDateTime* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-#line 2834 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+#line 2930 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_date_time_format (self, "%FT%H:%M:%S%z");
-#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp0_;
-#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7859 "FacebookPublishing.c"
+#line 7853 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 7866 "FacebookPublishing.c"
+#line 7860 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 7873 "FacebookPublishing.c"
+#line 7867 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
 	PublishingFacebookGraphSessionGraphUploadMessage* self = NULL;
 	PublishingFacebookEndpoint _tmp0_ = 0;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	SpitPublishingPublisherMediaType _tmp2_ = 0;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	SpitPublishingPublishable* _tmp1_;
+	SpitPublishingPublisherMediaType _tmp2_;
+	PublishingFacebookGraphSession* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	SpitPublishingPublishable* _tmp7_ = NULL;
-	SpitPublishingPublisherMediaType _tmp8_ = 0;
-	SpitPublishingPublishable* _tmp10_ = NULL;
-	SpitPublishingPublishable* _tmp11_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp21_ = 0;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	SoupURI* _tmp25_ = NULL;
-	SoupURI* _tmp26_ = NULL;
-	SoupMessage* _tmp27_ = NULL;
-	SoupMessage* _tmp28_ = NULL;
+	SpitPublishingPublishable* _tmp7_;
+	SpitPublishingPublisherMediaType _tmp8_;
+	SpitPublishingPublishable* _tmp10_;
+	SpitPublishingPublishable* _tmp11_;
+	PublishingRESTSupportHttpMethod _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	const gchar* _tmp24_;
+	SoupURI* _tmp25_;
+	SoupURI* _tmp26_;
+	SoupMessage* _tmp27_;
+	SoupMessage* _tmp28_;
 	guint8* payload = NULL;
-	GMappedFile* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	gint payload_length1 = 0;
-	gint _payload_size_ = 0;
-	GMappedFile* _tmp31_ = NULL;
-	gsize _tmp32_ = 0UL;
-	gint _tmp33_ = 0;
+	GMappedFile* _tmp29_;
+	gchar* _tmp30_;
+	gint payload_length1;
+	gint _payload_size_;
+	GMappedFile* _tmp31_;
+	gsize _tmp32_;
+	gint _tmp33_;
 	SoupBuffer* image_data = NULL;
-	guint8* _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	SoupBuffer* _tmp35_ = NULL;
+	guint8* _tmp34_;
+	gint _tmp34__length1;
+	SoupBuffer* _tmp35_;
 	SoupMultipart* mp_envelope = NULL;
-	SoupMultipart* _tmp36_ = NULL;
-	SoupMultipart* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
-	SpitPublishingPublishable* _tmp39_ = NULL;
-	SpitPublishingPublisherMediaType _tmp40_ = 0;
+	SoupMultipart* _tmp36_;
+	SoupMultipart* _tmp37_;
+	const gchar* _tmp38_;
+	SpitPublishingPublishable* _tmp39_;
+	SpitPublishingPublisherMediaType _tmp40_;
 	gchar* publishable_title = NULL;
-	SpitPublishingPublishable* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
+	SpitPublishingPublishable* _tmp43_;
+	gchar* _tmp44_;
 	gboolean _tmp45_ = FALSE;
-	gboolean _tmp46_ = FALSE;
+	gboolean _tmp46_;
 	gchar* publishable_comment = NULL;
-	SpitPublishingPublishable* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
+	SpitPublishingPublishable* _tmp50_;
+	gchar* _tmp51_;
 	gboolean _tmp52_ = FALSE;
-	gboolean _tmp53_ = FALSE;
-	gboolean _tmp57_ = FALSE;
+	gboolean _tmp53_;
+	gboolean _tmp57_;
 	const gchar* _tmp64_ = NULL;
-	SpitPublishingPublishable* _tmp65_ = NULL;
-	SpitPublishingPublisherMediaType _tmp66_ = 0;
+	SpitPublishingPublishable* _tmp65_;
+	SpitPublishingPublisherMediaType _tmp66_;
 	gchar* source_file_mime_type = NULL;
-	gchar* _tmp67_ = NULL;
-	SoupMultipart* _tmp68_ = NULL;
-	SpitPublishingPublishable* _tmp69_ = NULL;
-	GFile* _tmp70_ = NULL;
-	GFile* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	SoupBuffer* _tmp75_ = NULL;
-	SoupMultipart* _tmp76_ = NULL;
-	SoupMessage* _tmp77_ = NULL;
-	SoupMessageHeaders* _tmp78_ = NULL;
-	SoupMessage* _tmp79_ = NULL;
-	SoupMessageBody* _tmp80_ = NULL;
+	gchar* _tmp67_;
+	SoupMultipart* _tmp68_;
+	SpitPublishingPublishable* _tmp69_;
+	GFile* _tmp70_;
+	GFile* _tmp71_;
+	gchar* _tmp72_;
+	gchar* _tmp73_;
+	const gchar* _tmp74_;
+	SoupBuffer* _tmp75_;
+	SoupMultipart* _tmp76_;
+	SoupMessage* _tmp77_;
+	SoupMessageHeaders* _tmp78_;
+	SoupMessage* _tmp79_;
+	SoupMessageBody* _tmp80_;
 	GError * _inner_error_ = NULL;
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
@@ -7978,11 +7972,11 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_VIDEO;
-#line 7962 "FacebookPublishing.c"
+#line 7956 "FacebookPublishing.c"
 	} else {
 #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT;
-#line 7966 "FacebookPublishing.c"
+#line 7960 "FacebookPublishing.c"
 	}
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = host_session;
@@ -8000,14 +7994,14 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	if (_tmp8_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 7984 "FacebookPublishing.c"
+#line 7978 "FacebookPublishing.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp9_;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = resource_privacy;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp9_ != NULL;
-#line 7991 "FacebookPublishing.c"
+#line 7985 "FacebookPublishing.c"
 	}
 #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp6_, "publishable.get_media_type() != Spit.Publishing.Publisher.MediaType.VIDEO ||                 resource_privacy != null");
@@ -8019,17 +8013,17 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	_g_object_unref0 (self->priv->publishable);
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishable = _tmp11_;
-#line 8003 "FacebookPublishing.c"
+#line 7997 "FacebookPublishing.c"
 	{
 		GMappedFile* _tmp12_ = NULL;
-		SpitPublishingPublishable* _tmp13_ = NULL;
-		GFile* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		GMappedFile* _tmp18_ = NULL;
-		GMappedFile* _tmp19_ = NULL;
-		GMappedFile* _tmp20_ = NULL;
+		SpitPublishingPublishable* _tmp13_;
+		GFile* _tmp14_;
+		GFile* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		GMappedFile* _tmp18_;
+		GMappedFile* _tmp19_;
+		GMappedFile* _tmp20_;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = publishable;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8054,7 +8048,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 8038 "FacebookPublishing.c"
+#line 8032 "FacebookPublishing.c"
 				goto __catch5_g_file_error;
 			}
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8063,7 +8057,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 			g_clear_error (&_inner_error_);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 8047 "FacebookPublishing.c"
+#line 8041 "FacebookPublishing.c"
 		}
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = _tmp12_;
@@ -8075,7 +8069,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		self->priv->mapped_file = _tmp20_;
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (_tmp12_);
-#line 8059 "FacebookPublishing.c"
+#line 8053 "FacebookPublishing.c"
 	}
 	goto __finally5;
 	__catch5_g_file_error:
@@ -8089,7 +8083,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		_g_error_free0 (e);
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return self;
-#line 8073 "FacebookPublishing.c"
+#line 8067 "FacebookPublishing.c"
 	}
 	__finally5:
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8100,7 +8094,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		g_clear_error (&_inner_error_);
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 8084 "FacebookPublishing.c"
+#line 8078 "FacebookPublishing.c"
 	}
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
@@ -8135,7 +8129,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload = (guint8*) _tmp30_;
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	payload_length1 = -1;
+	payload_length1 = sizeof (gchar) / sizeof (guint8);
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_payload_size_ = payload_length1;
 #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8170,16 +8164,16 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	_tmp40_ = spit_publishing_publishable_get_media_type (_tmp39_);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp40_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 8154 "FacebookPublishing.c"
-		SoupMultipart* _tmp41_ = NULL;
-		const gchar* _tmp42_ = NULL;
+#line 8148 "FacebookPublishing.c"
+		SoupMultipart* _tmp41_;
+		const gchar* _tmp42_;
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp41_ = mp_envelope;
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp42_ = resource_privacy;
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp41_, "privacy", _tmp42_);
-#line 8163 "FacebookPublishing.c"
+#line 8157 "FacebookPublishing.c"
 	}
 #line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = publishable;
@@ -8191,30 +8185,30 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	_tmp46_ = suppress_titling;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp46_) {
-#line 8175 "FacebookPublishing.c"
-		const gchar* _tmp47_ = NULL;
+#line 8169 "FacebookPublishing.c"
+		const gchar* _tmp47_;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp47_ = publishable_title;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = _tmp47_ != NULL;
-#line 8181 "FacebookPublishing.c"
+#line 8175 "FacebookPublishing.c"
 	} else {
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = FALSE;
-#line 8185 "FacebookPublishing.c"
+#line 8179 "FacebookPublishing.c"
 	}
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp45_) {
-#line 8189 "FacebookPublishing.c"
-		SoupMultipart* _tmp48_ = NULL;
-		const gchar* _tmp49_ = NULL;
+#line 8183 "FacebookPublishing.c"
+		SoupMultipart* _tmp48_;
+		const gchar* _tmp49_;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp48_ = mp_envelope;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp49_ = publishable_title;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp48_, "name", _tmp49_);
-#line 8198 "FacebookPublishing.c"
+#line 8192 "FacebookPublishing.c"
 	}
 #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp50_ = publishable;
@@ -8226,42 +8220,42 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	_tmp53_ = suppress_titling;
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp53_) {
-#line 8210 "FacebookPublishing.c"
-		const gchar* _tmp54_ = NULL;
+#line 8204 "FacebookPublishing.c"
+		const gchar* _tmp54_;
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp54_ = publishable_comment;
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = _tmp54_ != NULL;
-#line 8216 "FacebookPublishing.c"
+#line 8210 "FacebookPublishing.c"
 	} else {
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = FALSE;
-#line 8220 "FacebookPublishing.c"
+#line 8214 "FacebookPublishing.c"
 	}
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp52_) {
-#line 8224 "FacebookPublishing.c"
-		SoupMultipart* _tmp55_ = NULL;
-		const gchar* _tmp56_ = NULL;
+#line 8218 "FacebookPublishing.c"
+		SoupMultipart* _tmp55_;
+		const gchar* _tmp56_;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp55_ = mp_envelope;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp56_ = publishable_comment;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp55_, "message", _tmp56_);
-#line 8233 "FacebookPublishing.c"
+#line 8227 "FacebookPublishing.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp57_ = suppress_titling;
 #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp57_) {
-#line 8239 "FacebookPublishing.c"
-		SoupMultipart* _tmp58_ = NULL;
-		SpitPublishingPublishable* _tmp59_ = NULL;
-		GDateTime* _tmp60_ = NULL;
-		GDateTime* _tmp61_ = NULL;
-		gchar* _tmp62_ = NULL;
-		gchar* _tmp63_ = NULL;
+#line 8233 "FacebookPublishing.c"
+		SoupMultipart* _tmp58_;
+		SpitPublishingPublishable* _tmp59_;
+		GDateTime* _tmp60_;
+		GDateTime* _tmp61_;
+		gchar* _tmp62_;
+		gchar* _tmp63_;
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp58_ = mp_envelope;
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8280,7 +8274,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		_g_free0 (_tmp63_);
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_date_time_unref0 (_tmp61_);
-#line 8264 "FacebookPublishing.c"
+#line 8258 "FacebookPublishing.c"
 	}
 #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp65_ = publishable;
@@ -8290,11 +8284,11 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	if (_tmp66_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "video";
-#line 8274 "FacebookPublishing.c"
+#line 8268 "FacebookPublishing.c"
 	} else {
 #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "image/jpeg";
-#line 8278 "FacebookPublishing.c"
+#line 8272 "FacebookPublishing.c"
 	}
 #line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp67_ = g_strdup (_tmp64_);
@@ -8346,37 +8340,37 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	__vala_SoupBuffer_free0 (image_data);
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8330 "FacebookPublishing.c"
+#line 8324 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_upload_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, host_session, access_token, relative_uri, publishable, suppress_titling, resource_privacy);
-#line 8337 "FacebookPublishing.c"
+#line 8331 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base) {
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
 	gboolean result = FALSE;
-	GMappedFile* _tmp0_ = NULL;
+	GMappedFile* _tmp0_;
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage);
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->mapped_file;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8351 "FacebookPublishing.c"
-		SpitPublishingPublishable* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+#line 8345 "FacebookPublishing.c"
+		SpitPublishingPublishable* _tmp1_;
+		GFile* _tmp2_;
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GError* _tmp8_;
+		GError* _tmp9_;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->publishable;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8396,7 +8390,7 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = _tmp8_;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp9_);
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp9_);
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp9_);
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8409,13 +8403,13 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 		result = FALSE;
 #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 8393 "FacebookPublishing.c"
+#line 8387 "FacebookPublishing.c"
 	} else {
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = TRUE;
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 8399 "FacebookPublishing.c"
+#line 8393 "FacebookPublishing.c"
 	}
 }
 
@@ -8428,8 +8422,8 @@ static void publishing_facebook_graph_session_graph_upload_message_class_init (P
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate));
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*)(PublishingFacebookGraphSessionGraphMessageImpl*)) publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission;
-#line 8413 "FacebookPublishing.c"
+	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*) (PublishingFacebookGraphSessionGraphMessageImpl *)) publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission;
+#line 8407 "FacebookPublishing.c"
 }
 
 
@@ -8438,11 +8432,11 @@ static void publishing_facebook_graph_session_graph_upload_message_instance_init
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE (self);
 #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->mapped_file = NULL;
-#line 8422 "FacebookPublishing.c"
+#line 8416 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage* obj) {
+static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj) {
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage);
@@ -8452,7 +8446,7 @@ static void publishing_facebook_graph_session_graph_upload_message_finalize (Pub
 	_g_object_unref0 (self->priv->publishable);
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_upload_message_parent_class)->finalize (obj);
-#line 8436 "FacebookPublishing.c"
+#line 8430 "FacebookPublishing.c"
 }
 
 
@@ -8470,26 +8464,26 @@ static GType publishing_facebook_graph_session_graph_upload_message_get_type (vo
 
 static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) {
 	PublishingFacebookGraphSessionGraphCreateAlbumMessage* self = NULL;
-	PublishingFacebookGraphSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingFacebookGraphSession* _tmp0_;
+	const gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	SoupURI* _tmp9_ = NULL;
-	SoupURI* _tmp10_ = NULL;
-	SoupMessage* _tmp11_ = NULL;
+	const gchar* _tmp3_;
+	PublishingRESTSupportHttpMethod _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	SoupURI* _tmp9_;
+	SoupURI* _tmp10_;
+	SoupMessage* _tmp11_;
 	SoupMultipart* mp_envelope = NULL;
-	SoupMultipart* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	SoupMessage* _tmp16_ = NULL;
-	SoupMessageHeaders* _tmp17_ = NULL;
-	SoupMessage* _tmp18_ = NULL;
-	SoupMessageBody* _tmp19_ = NULL;
+	SoupMultipart* _tmp12_;
+	const gchar* _tmp13_;
+	const gchar* _tmp14_;
+	const gchar* _tmp15_;
+	SoupMessage* _tmp16_;
+	SoupMessageHeaders* _tmp17_;
+	SoupMessage* _tmp18_;
+	SoupMessageBody* _tmp19_;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8508,17 +8502,17 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo
 	_tmp3_ = album_privacy;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp3_ != NULL) {
-#line 8492 "FacebookPublishing.c"
-		const gchar* _tmp4_ = NULL;
+#line 8486 "FacebookPublishing.c"
+		const gchar* _tmp4_;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = album_privacy;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 8498 "FacebookPublishing.c"
+#line 8492 "FacebookPublishing.c"
 	} else {
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = FALSE;
-#line 8502 "FacebookPublishing.c"
+#line 8496 "FacebookPublishing.c"
 	}
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_, "album_privacy != null && album_privacy != \"\"");
@@ -8574,21 +8568,21 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo
 	__vala_SoupMultipart_free0 (mp_envelope);
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8558 "FacebookPublishing.c"
+#line 8552 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) {
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_create_album_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_CREATE_ALBUM_MESSAGE, host_session, access_token, album_name, album_privacy);
-#line 8565 "FacebookPublishing.c"
+#line 8559 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass) {
 #line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_create_album_message_parent_class = g_type_class_peek_parent (klass);
-#line 8572 "FacebookPublishing.c"
+#line 8566 "FacebookPublishing.c"
 }
 
 
@@ -8611,7 +8605,7 @@ static GType publishing_facebook_graph_session_graph_create_album_message_get_ty
 static void publishing_facebook_value_graph_session_init (GValue* value) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8595 "FacebookPublishing.c"
+#line 8589 "FacebookPublishing.c"
 }
 
 
@@ -8620,7 +8614,7 @@ static void publishing_facebook_value_graph_session_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (value->data[0].v_pointer);
-#line 8604 "FacebookPublishing.c"
+#line 8598 "FacebookPublishing.c"
 	}
 }
 
@@ -8630,11 +8624,11 @@ static void publishing_facebook_value_graph_session_copy_value (const GValue* sr
 	if (src_value->data[0].v_pointer) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_graph_session_ref (src_value->data[0].v_pointer);
-#line 8614 "FacebookPublishing.c"
+#line 8608 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8618 "FacebookPublishing.c"
+#line 8612 "FacebookPublishing.c"
 	}
 }
 
@@ -8642,66 +8636,66 @@ static void publishing_facebook_value_graph_session_copy_value (const GValue* sr
 static gpointer publishing_facebook_value_graph_session_peek_pointer (const GValue* value) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8626 "FacebookPublishing.c"
+#line 8620 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8633 "FacebookPublishing.c"
-		PublishingFacebookGraphSession* object;
+#line 8627 "FacebookPublishing.c"
+		PublishingFacebookGraphSession * object;
 		object = collect_values[0].v_pointer;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8640 "FacebookPublishing.c"
+#line 8634 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8644 "FacebookPublishing.c"
+#line 8638 "FacebookPublishing.c"
 		}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_session_ref (object);
-#line 8648 "FacebookPublishing.c"
+#line 8642 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8652 "FacebookPublishing.c"
+#line 8646 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8656 "FacebookPublishing.c"
+#line 8650 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFacebookGraphSession** object_p;
+	PublishingFacebookGraphSession ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8667 "FacebookPublishing.c"
+#line 8661 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 8673 "FacebookPublishing.c"
+#line 8667 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8677 "FacebookPublishing.c"
+#line 8671 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 8681 "FacebookPublishing.c"
+#line 8675 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8685 "FacebookPublishing.c"
+#line 8679 "FacebookPublishing.c"
 }
 
 
@@ -8715,7 +8709,7 @@ GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8699 "FacebookPublishing.c"
+#line 8693 "FacebookPublishing.c"
 }
 
 
@@ -8724,12 +8718,12 @@ gpointer publishing_facebook_value_get_graph_session (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8708 "FacebookPublishing.c"
+#line 8702 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object) {
-	PublishingFacebookGraphSession* old;
+	PublishingFacebookGraphSession * old;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8744,23 +8738,23 @@ void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 8728 "FacebookPublishing.c"
+#line 8722 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8732 "FacebookPublishing.c"
+#line 8726 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 8738 "FacebookPublishing.c"
+#line 8732 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object) {
-	PublishingFacebookGraphSession* old;
+	PublishingFacebookGraphSession * old;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8773,17 +8767,17 @@ void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8757 "FacebookPublishing.c"
+#line 8751 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8761 "FacebookPublishing.c"
+#line 8755 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 8767 "FacebookPublishing.c"
+#line 8761 "FacebookPublishing.c"
 	}
 }
 
@@ -8796,8 +8790,8 @@ static void publishing_facebook_graph_session_class_init (PublishingFacebookGrap
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionPrivate));
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8781 "FacebookPublishing.c"
+	publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 8775 "FacebookPublishing.c"
 }
 
 
@@ -8806,14 +8800,14 @@ static void publishing_facebook_graph_session_instance_init (PublishingFacebookG
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE (self);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8790 "FacebookPublishing.c"
+#line 8784 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession* obj) {
+static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj) {
 	PublishingFacebookGraphSession * self;
-	SoupSession* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	SoupSession* _tmp0_;
+	guint _tmp1_;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSession);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8830,7 +8824,7 @@ static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphS
 	_g_free0 (self->priv->access_token);
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 8814 "FacebookPublishing.c"
+#line 8808 "FacebookPublishing.c"
 }
 
 
@@ -8849,18 +8843,18 @@ GType publishing_facebook_graph_session_get_type (void) {
 
 
 gpointer publishing_facebook_graph_session_ref (gpointer instance) {
-	PublishingFacebookGraphSession* self;
+	PublishingFacebookGraphSession * self;
 	self = instance;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8839 "FacebookPublishing.c"
+#line 8833 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_unref (gpointer instance) {
-	PublishingFacebookGraphSession* self;
+	PublishingFacebookGraphSession * self;
 	self = instance;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8868,7 +8862,7 @@ void publishing_facebook_graph_session_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_CLASS (self)->finalize (self);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8852 "FacebookPublishing.c"
+#line 8846 "FacebookPublishing.c"
 	}
 }
 
@@ -8880,44 +8874,44 @@ static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable**
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 8864 "FacebookPublishing.c"
-		SpitPublishingPublishable* _tmp0_ = NULL;
+#line 8858 "FacebookPublishing.c"
+		SpitPublishingPublishable* _tmp0_;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 8870 "FacebookPublishing.c"
+#line 8864 "FacebookPublishing.c"
 	}
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 8874 "FacebookPublishing.c"
+#line 8868 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_session_ref0 (gpointer self) {
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_session_ref (self) : NULL;
-#line 8881 "FacebookPublishing.c"
+#line 8875 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_parameters_ref0 (gpointer self) {
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_parameters_ref (self) : NULL;
-#line 8888 "FacebookPublishing.c"
+#line 8882 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type, PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
 	PublishingFacebookUploader* self = NULL;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingFacebookGraphSession* _tmp2_ = NULL;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp4_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp5_ = NULL;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingFacebookGraphSession* _tmp2_;
+	PublishingFacebookGraphSession* _tmp3_;
+	PublishingFacebookPublishingParameters* _tmp4_;
+	PublishingFacebookPublishingParameters* _tmp5_;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (session), NULL);
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8960,72 +8954,72 @@ PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object
 	self->priv->publishing_params = _tmp5_;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8944 "FacebookPublishing.c"
+#line 8938 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_uploader_construct (PUBLISHING_FACEBOOK_TYPE_UPLOADER, session, publishing_params, publishables, publishables_length1);
-#line 8951 "FacebookPublishing.c"
+#line 8945 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender, gint bytes_sent_so_far, gint total_bytes, gpointer self) {
 #line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_chunk_transmitted ((PublishingFacebookUploader*) self, bytes_sent_so_far, total_bytes);
-#line 8958 "FacebookPublishing.c"
+#line 8952 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_completed ((PublishingFacebookUploader*) self, _sender);
-#line 8965 "FacebookPublishing.c"
+#line 8959 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_failed ((PublishingFacebookUploader*) self, _sender, err);
-#line 8972 "FacebookPublishing.c"
+#line 8966 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self) {
 	SpitPublishingPublishable* publishable = NULL;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gint _tmp1_ = 0;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
+	gint _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
 	GFile* file = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
+	SpitPublishingPublishable* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
 	gchar* _tmp8_ = NULL;
-	SpitPublishingPublishable* _tmp9_ = NULL;
-	SpitPublishingPublisherMediaType _tmp10_ = 0;
+	SpitPublishingPublishable* _tmp9_;
+	SpitPublishingPublisherMediaType _tmp10_;
 	gchar* resource_uri = NULL;
-	gchar* _tmp16_ = NULL;
+	gchar* _tmp16_;
 	const gchar* _tmp17_ = NULL;
-	SpitPublishingPublishable* _tmp18_ = NULL;
-	SpitPublishingPublisherMediaType _tmp19_ = 0;
+	SpitPublishingPublishable* _tmp18_;
+	SpitPublishingPublisherMediaType _tmp19_;
 	gchar* resource_privacy = NULL;
-	gchar* _tmp22_ = NULL;
+	gchar* _tmp22_;
 	PublishingFacebookGraphMessage* upload_message = NULL;
-	PublishingFacebookGraphSession* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	SpitPublishingPublishable* _tmp25_ = NULL;
-	PublishingFacebookPublishingParameters* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
-	const gchar* _tmp28_ = NULL;
-	PublishingFacebookGraphMessage* _tmp29_ = NULL;
-	PublishingFacebookGraphMessage* _tmp30_ = NULL;
-	PublishingFacebookGraphMessage* _tmp31_ = NULL;
-	PublishingFacebookGraphMessage* _tmp32_ = NULL;
-	PublishingFacebookGraphSession* _tmp33_ = NULL;
-	PublishingFacebookGraphMessage* _tmp34_ = NULL;
+	PublishingFacebookGraphSession* _tmp23_;
+	const gchar* _tmp24_;
+	SpitPublishingPublishable* _tmp25_;
+	PublishingFacebookPublishingParameters* _tmp26_;
+	gboolean _tmp27_;
+	const gchar* _tmp28_;
+	PublishingFacebookGraphMessage* _tmp29_;
+	PublishingFacebookGraphMessage* _tmp30_;
+	PublishingFacebookGraphMessage* _tmp31_;
+	PublishingFacebookGraphMessage* _tmp32_;
+	PublishingFacebookGraphSession* _tmp33_;
+	PublishingFacebookGraphMessage* _tmp34_;
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9050,8 +9044,8 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	_tmp6_ = file;
 #line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_ == NULL) {
-#line 9034 "FacebookPublishing.c"
-		gint _tmp7_ = 0;
+#line 9028 "FacebookPublishing.c"
+		gint _tmp7_;
 #line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->current_file;
 #line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9062,7 +9056,7 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 		_g_object_unref0 (publishable);
 #line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 9046 "FacebookPublishing.c"
+#line 9040 "FacebookPublishing.c"
 	}
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishable;
@@ -9070,11 +9064,11 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp10_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 9054 "FacebookPublishing.c"
-		PublishingFacebookPublishingParameters* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+#line 9048 "FacebookPublishing.c"
+		PublishingFacebookPublishingParameters* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = self->priv->publishing_params;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9089,16 +9083,16 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 		_tmp8_ = _tmp14_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 9073 "FacebookPublishing.c"
+#line 9067 "FacebookPublishing.c"
 	} else {
-		gchar* _tmp15_ = NULL;
+		gchar* _tmp15_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = g_strdup ("/me/videos");
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp15_;
-#line 9082 "FacebookPublishing.c"
+#line 9076 "FacebookPublishing.c"
 	}
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = g_strdup (_tmp8_);
@@ -9110,20 +9104,20 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	_tmp19_ = spit_publishing_publishable_get_media_type (_tmp18_);
 #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp19_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 9094 "FacebookPublishing.c"
-		PublishingFacebookPublishingParameters* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
+#line 9088 "FacebookPublishing.c"
+		PublishingFacebookPublishingParameters* _tmp20_;
+		const gchar* _tmp21_;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = self->priv->publishing_params;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp21_ = _tmp20_->privacy_object;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp21_;
-#line 9103 "FacebookPublishing.c"
+#line 9097 "FacebookPublishing.c"
 	} else {
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = NULL;
-#line 9107 "FacebookPublishing.c"
+#line 9101 "FacebookPublishing.c"
 	}
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = g_strdup (_tmp17_);
@@ -9175,7 +9169,7 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	_g_object_unref0 (file);
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (publishable);
-#line 9159 "FacebookPublishing.c"
+#line 9153 "FacebookPublishing.c"
 }
 
 
@@ -9186,24 +9180,24 @@ static void publishing_facebook_uploader_send_files (PublishingFacebookUploader*
 	self->priv->current_file = 0;
 #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_send_current_file (self);
-#line 9170 "FacebookPublishing.c"
+#line 9164 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self, gint bytes_written_so_far, gint total_bytes) {
 	gdouble file_span = 0.0;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
 	gdouble this_file_fraction_complete = 0.0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
 	gdouble fraction_complete = 0.0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	SpitPublishingProgressCallback _tmp7_ = NULL;
-	void* _tmp7__target = NULL;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	SpitPublishingProgressCallback _tmp7_;
+	void* _tmp7__target;
 #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9234,11 +9228,11 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo
 	_tmp7__target = self->priv->status_updated_target;
 #line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 9218 "FacebookPublishing.c"
-		SpitPublishingProgressCallback _tmp8_ = NULL;
-		void* _tmp8__target = NULL;
-		gint _tmp9_ = 0;
-		gdouble _tmp10_ = 0.0;
+#line 9212 "FacebookPublishing.c"
+		SpitPublishingProgressCallback _tmp8_;
+		void* _tmp8__target;
+		gint _tmp9_;
+		gdouble _tmp10_;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = self->priv->status_updated;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9249,22 +9243,22 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo
 		_tmp10_ = fraction_complete;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 9233 "FacebookPublishing.c"
+#line 9227 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingFacebookGraphMessage* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	SpitPublishingPublishable** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	PublishingFacebookGraphMessage* _tmp4_;
+	guint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	SpitPublishingPublishable** _tmp8_;
+	gint _tmp8__length1;
 #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9301,26 +9295,26 @@ static void publishing_facebook_uploader_on_message_completed (PublishingFaceboo
 	if (_tmp7_ < _tmp8__length1) {
 #line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_current_file (self);
-#line 9285 "FacebookPublishing.c"
+#line 9279 "FacebookPublishing.c"
 	} else {
-		gint _tmp9_ = 0;
+		gint _tmp9_;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = self->priv->current_file;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit_by_name (self, "upload-complete", _tmp9_);
-#line 9292 "FacebookPublishing.c"
+		g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp9_);
+#line 9286 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingFacebookGraphMessage* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	GError* _tmp6_ = NULL;
+	PublishingFacebookGraphMessage* _tmp0_;
+	guint _tmp1_;
+	PublishingFacebookGraphMessage* _tmp2_;
+	guint _tmp3_;
+	PublishingFacebookGraphMessage* _tmp4_;
+	guint _tmp5_;
+	GError* _tmp6_;
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9346,16 +9340,16 @@ static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUp
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _error_;
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit_by_name (self, "upload-error", _tmp6_);
-#line 9331 "FacebookPublishing.c"
+	g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp6_);
+#line 9325 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) {
-	SpitPublishingProgressCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
 #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9374,7 +9368,7 @@ void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, Spit
 	if (_tmp1__length1 > 0) {
 #line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_files (self);
-#line 9358 "FacebookPublishing.c"
+#line 9352 "FacebookPublishing.c"
 	}
 }
 
@@ -9382,7 +9376,7 @@ void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, Spit
 static void publishing_facebook_value_uploader_init (GValue* value) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 9366 "FacebookPublishing.c"
+#line 9360 "FacebookPublishing.c"
 }
 
 
@@ -9391,7 +9385,7 @@ static void publishing_facebook_value_uploader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (value->data[0].v_pointer);
-#line 9375 "FacebookPublishing.c"
+#line 9369 "FacebookPublishing.c"
 	}
 }
 
@@ -9401,11 +9395,11 @@ static void publishing_facebook_value_uploader_copy_value (const GValue* src_val
 	if (src_value->data[0].v_pointer) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_uploader_ref (src_value->data[0].v_pointer);
-#line 9385 "FacebookPublishing.c"
+#line 9379 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9389 "FacebookPublishing.c"
+#line 9383 "FacebookPublishing.c"
 	}
 }
 
@@ -9413,66 +9407,66 @@ static void publishing_facebook_value_uploader_copy_value (const GValue* src_val
 static gpointer publishing_facebook_value_uploader_peek_pointer (const GValue* value) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9397 "FacebookPublishing.c"
+#line 9391 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9404 "FacebookPublishing.c"
-		PublishingFacebookUploader* object;
+#line 9398 "FacebookPublishing.c"
+		PublishingFacebookUploader * object;
 		object = collect_values[0].v_pointer;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9411 "FacebookPublishing.c"
+#line 9405 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9415 "FacebookPublishing.c"
+#line 9409 "FacebookPublishing.c"
 		}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_uploader_ref (object);
-#line 9419 "FacebookPublishing.c"
+#line 9413 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9423 "FacebookPublishing.c"
+#line 9417 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 9427 "FacebookPublishing.c"
+#line 9421 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFacebookUploader** object_p;
+	PublishingFacebookUploader ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9438 "FacebookPublishing.c"
+#line 9432 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 9444 "FacebookPublishing.c"
+#line 9438 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9448 "FacebookPublishing.c"
+#line 9442 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 9452 "FacebookPublishing.c"
+#line 9446 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 9456 "FacebookPublishing.c"
+#line 9450 "FacebookPublishing.c"
 }
 
 
@@ -9486,7 +9480,7 @@ GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9470 "FacebookPublishing.c"
+#line 9464 "FacebookPublishing.c"
 }
 
 
@@ -9495,12 +9489,12 @@ gpointer publishing_facebook_value_get_uploader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9479 "FacebookPublishing.c"
+#line 9473 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
-	PublishingFacebookUploader* old;
+	PublishingFacebookUploader * old;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9515,23 +9509,23 @@ void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 9499 "FacebookPublishing.c"
+#line 9493 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9503 "FacebookPublishing.c"
+#line 9497 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 9509 "FacebookPublishing.c"
+#line 9503 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) {
-	PublishingFacebookUploader* old;
+	PublishingFacebookUploader * old;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9544,17 +9538,17 @@ void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9528 "FacebookPublishing.c"
+#line 9522 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9532 "FacebookPublishing.c"
+#line 9526 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 9538 "FacebookPublishing.c"
+#line 9532 "FacebookPublishing.c"
 	}
 }
 
@@ -9567,10 +9561,10 @@ static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderC
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookUploaderPrivate));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("upload_complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+	publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = g_signal_new ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("upload_error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 9554 "FacebookPublishing.c"
+	publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL] = g_signal_new ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+#line 9548 "FacebookPublishing.c"
 }
 
 
@@ -9579,13 +9573,15 @@ static void publishing_facebook_uploader_instance_init (PublishingFacebookUpload
 	self->priv = PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE (self);
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated = NULL;
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->status_updated_target = self;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 9565 "FacebookPublishing.c"
+#line 9561 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj) {
+static void publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj) {
 	PublishingFacebookUploader * self;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploader);
@@ -9597,7 +9593,7 @@ static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* o
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
 #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 9581 "FacebookPublishing.c"
+#line 9577 "FacebookPublishing.c"
 }
 
 
@@ -9616,18 +9612,18 @@ GType publishing_facebook_uploader_get_type (void) {
 
 
 gpointer publishing_facebook_uploader_ref (gpointer instance) {
-	PublishingFacebookUploader* self;
+	PublishingFacebookUploader * self;
 	self = instance;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 9606 "FacebookPublishing.c"
+#line 9602 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_uploader_unref (gpointer instance) {
-	PublishingFacebookUploader* self;
+	PublishingFacebookUploader * self;
 	self = instance;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -9635,7 +9631,7 @@ void publishing_facebook_uploader_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_UPLOADER_GET_CLASS (self)->finalize (self);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9619 "FacebookPublishing.c"
+#line 9615 "FacebookPublishing.c"
 	}
 }
 
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index a15a23d..25f2d69 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -1,4 +1,4 @@
-/* FlickrPublishing.c generated by valac 0.34.7, the Vala compiler
+/* FlickrPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from FlickrPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -179,6 +179,12 @@ typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate Publishing
 #define _publishing_flickr_publishing_options_pane_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_options_pane_size_entry_unref (var), NULL)))
 typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry;
 typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry;
+enum  {
+	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingFlickrUploaderPrivate PublishingFlickrUploaderPrivate;
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
@@ -398,12 +404,12 @@ static gint flickr_service_icon_pixbuf_set_length1;
 static GdkPixbuf** flickr_service_icon_pixbuf_set = NULL;
 static gint flickr_service_icon_pixbuf_set_length1 = 0;
 static gint _flickr_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* flickr_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* flickr_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * flickr_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * flickr_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_flickr_visibility_specification_parent_class = NULL;
 static gpointer publishing_flickr_publishing_parameters_parent_class = NULL;
 static gpointer publishing_flickr_flickr_publisher_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = NULL;
 static gpointer publishing_flickr_transaction_parent_class = NULL;
 static gpointer publishing_flickr_account_info_fetch_transaction_parent_class = NULL;
 static gpointer publishing_flickr_upload_transaction_parent_class = NULL;
@@ -411,7 +417,7 @@ static gpointer publishing_flickr_session_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_size_entry_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_flickr_uploader_parent_class = NULL;
 
 GType flickr_service_get_type (void) G_GNUC_CONST;
@@ -432,7 +438,7 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPub
 PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
 GType publishing_flickr_flickr_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base);
-static void flickr_service_finalize (GObject* obj);
+static void flickr_service_finalize (GObject * obj);
 #define PUBLISHING_FLICKR_SERVICE_NAME "Flickr"
 #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
 #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1
@@ -451,7 +457,7 @@ enum  {
 };
 PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level);
 PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level);
-static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj);
+static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj);
 gpointer publishing_flickr_publishing_parameters_ref (gpointer instance);
 void publishing_flickr_publishing_parameters_unref (gpointer instance);
 GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -464,7 +470,7 @@ enum  {
 };
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void);
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type);
-static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters* obj);
+static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj);
 GType publishing_flickr_session_get_type (void) G_GNUC_CONST;
 GType publishing_flickr_publishing_options_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisherPrivate))
@@ -523,7 +529,7 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic
 static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base);
 static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base);
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base);
-static void publishing_flickr_flickr_publisher_finalize (GObject* obj);
+static void publishing_flickr_flickr_publisher_finalize (GObject * obj);
 enum  {
 	PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY
 };
@@ -551,19 +557,19 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (Pub
 PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
 void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value);
 static void _g_free0_ (gpointer var);
-static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
+static void _vala_array_add19 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
 PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1);
 static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length);
 gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self);
 static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
+static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
 #define PUBLISHING_FLICKR_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionPrivate))
 enum  {
 	PUBLISHING_FLICKR_SESSION_DUMMY_PROPERTY
 };
 static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void _vala_array_add20 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
-static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj);
+static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
+static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj);
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance);
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance);
 static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -596,18 +602,18 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size);
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self);
 void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self);
 static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
@@ -619,20 +625,20 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (
 enum  {
 	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_DUMMY_PROPERTY
 };
-static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj);
+static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj);
 enum  {
 	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_DUMMY_PROPERTY
 };
-static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj);
-static void publishing_flickr_publishing_options_pane_finalize (GObject* obj);
+static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj);
+static void publishing_flickr_publishing_options_pane_finalize (GObject * obj);
 #define PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploaderPrivate))
 enum  {
 	PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY
 };
 static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable);
-static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value);
 static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -640,8 +646,8 @@ static gint _vala_array_length (gpointer array);
 
 FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory) {
 	FlickrService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -652,9 +658,9 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = flickr_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 656 "FlickrPublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 662 "FlickrPublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" FLICKR_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -665,27 +671,27 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
 		flickr_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_flickr_service_icon_pixbuf_set_size_ = flickr_service_icon_pixbuf_set_length1;
-#line 669 "FlickrPublishing.c"
+#line 675 "FlickrPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 673 "FlickrPublishing.c"
+#line 679 "FlickrPublishing.c"
 }
 
 
 FlickrService* flickr_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return flickr_service_construct (TYPE_FLICKR_SERVICE, resource_directory);
-#line 680 "FlickrPublishing.c"
+#line 686 "FlickrPublishing.c"
 }
 
 
 static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	FlickrService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -698,7 +704,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 702 "FlickrPublishing.c"
+#line 708 "FlickrPublishing.c"
 }
 
 
@@ -711,7 +717,7 @@ static const gchar* flickr_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.flickr";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 715 "FlickrPublishing.c"
+#line 721 "FlickrPublishing.c"
 }
 
 
@@ -724,14 +730,14 @@ static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Flickr";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 728 "FlickrPublishing.c"
+#line 734 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 735 "FlickrPublishing.c"
+#line 741 "FlickrPublishing.c"
 }
 
 
@@ -742,34 +748,33 @@ static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 746 "FlickrPublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 752 "FlickrPublishing.c"
+		GdkPixbuf* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result[i] = _tmp0_;
-#line 752 "FlickrPublishing.c"
+#line 758 "FlickrPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 756 "FlickrPublishing.c"
+#line 762 "FlickrPublishing.c"
 }
 
 
 static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	FlickrService * 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 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -781,60 +786,58 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*info).authors = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc.");
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 ((*info).translators);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 ((*info).version);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 ((*info).license);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = flickr_service_icon_pixbuf_set;
+	_tmp7_ = flickr_service_icon_pixbuf_set;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8__length1 = flickr_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = flickr_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup7 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup7 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 838 "FlickrPublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 841 "FlickrPublishing.c"
 }
 
 
@@ -842,15 +845,15 @@ static void flickr_service_real_activation (SpitPluggable* base, gboolean enable
 	FlickrService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
-#line 846 "FlickrPublishing.c"
+#line 849 "FlickrPublishing.c"
 }
 
 
 static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	FlickrService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingFlickrFlickrPublisher* _tmp1_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -863,7 +866,7 @@ static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 867 "FlickrPublishing.c"
+#line 870 "FlickrPublishing.c"
 }
 
 
@@ -876,7 +879,7 @@ static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 880 "FlickrPublishing.c"
+#line 883 "FlickrPublishing.c"
 }
 
 
@@ -885,7 +888,7 @@ static void flickr_service_class_init (FlickrServiceClass * klass) {
 	flickr_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = flickr_service_finalize;
-#line 889 "FlickrPublishing.c"
+#line 892 "FlickrPublishing.c"
 }
 
 
@@ -893,16 +896,16 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	flickr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) flickr_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) flickr_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) flickr_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) flickr_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) flickr_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) flickr_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) flickr_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) flickr_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) flickr_service_real_activation;
-#line 906 "FlickrPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) flickr_service_real_activation;
+#line 909 "FlickrPublishing.c"
 }
 
 
@@ -910,10 +913,10 @@ static void flickr_service_spit_publishing_service_interface_init (SpitPublishin
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	flickr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) flickr_service_real_create_publisher;
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) flickr_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) flickr_service_real_get_supported_media;
-#line 917 "FlickrPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) flickr_service_real_get_supported_media;
+#line 920 "FlickrPublishing.c"
 }
 
 
@@ -921,13 +924,13 @@ static void flickr_service_instance_init (FlickrService * self) {
 }
 
 
-static void flickr_service_finalize (GObject* obj) {
+static void flickr_service_finalize (GObject * obj) {
 	FlickrService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLICKR_SERVICE, FlickrService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (flickr_service_parent_class)->finalize (obj);
-#line 931 "FlickrPublishing.c"
+#line 934 "FlickrPublishing.c"
 }
 
 
@@ -961,9 +964,9 @@ GType publishing_flickr_user_kind_get_type (void) {
 
 PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level) {
 	PublishingFlickrVisibilitySpecification* self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -980,21 +983,21 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat
 	self->everyone_level = _tmp2_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 984 "FlickrPublishing.c"
+#line 987 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) {
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level);
-#line 991 "FlickrPublishing.c"
+#line 994 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_visibility_specification_init (GValue* value) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 998 "FlickrPublishing.c"
+#line 1001 "FlickrPublishing.c"
 }
 
 
@@ -1003,7 +1006,7 @@ static void publishing_flickr_value_visibility_specification_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (value->data[0].v_pointer);
-#line 1007 "FlickrPublishing.c"
+#line 1010 "FlickrPublishing.c"
 	}
 }
 
@@ -1013,11 +1016,11 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G
 	if (src_value->data[0].v_pointer) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (src_value->data[0].v_pointer);
-#line 1017 "FlickrPublishing.c"
+#line 1020 "FlickrPublishing.c"
 	} else {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1021 "FlickrPublishing.c"
+#line 1024 "FlickrPublishing.c"
 	}
 }
 
@@ -1025,66 +1028,66 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G
 static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1029 "FlickrPublishing.c"
+#line 1032 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1036 "FlickrPublishing.c"
-		PublishingFlickrVisibilitySpecification* object;
+#line 1039 "FlickrPublishing.c"
+		PublishingFlickrVisibilitySpecification * object;
 		object = collect_values[0].v_pointer;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1043 "FlickrPublishing.c"
+#line 1046 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1047 "FlickrPublishing.c"
+#line 1050 "FlickrPublishing.c"
 		}
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object);
-#line 1051 "FlickrPublishing.c"
+#line 1054 "FlickrPublishing.c"
 	} else {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1055 "FlickrPublishing.c"
+#line 1058 "FlickrPublishing.c"
 	}
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1059 "FlickrPublishing.c"
+#line 1062 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFlickrVisibilitySpecification** object_p;
+	PublishingFlickrVisibilitySpecification ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1070 "FlickrPublishing.c"
+#line 1073 "FlickrPublishing.c"
 	}
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1076 "FlickrPublishing.c"
+#line 1079 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1080 "FlickrPublishing.c"
+#line 1083 "FlickrPublishing.c"
 	} else {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1084 "FlickrPublishing.c"
+#line 1087 "FlickrPublishing.c"
 	}
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1088 "FlickrPublishing.c"
+#line 1091 "FlickrPublishing.c"
 }
 
 
@@ -1098,7 +1101,7 @@ GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1102 "FlickrPublishing.c"
+#line 1105 "FlickrPublishing.c"
 }
 
 
@@ -1107,12 +1110,12 @@ gpointer publishing_flickr_value_get_visibility_specification (const GValue* val
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1111 "FlickrPublishing.c"
+#line 1114 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) {
-	PublishingFlickrVisibilitySpecification* old;
+	PublishingFlickrVisibilitySpecification * old;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1127,23 +1130,23 @@ void publishing_flickr_value_set_visibility_specification (GValue* value, gpoint
 		value->data[0].v_pointer = v_object;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1131 "FlickrPublishing.c"
+#line 1134 "FlickrPublishing.c"
 	} else {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1135 "FlickrPublishing.c"
+#line 1138 "FlickrPublishing.c"
 	}
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1141 "FlickrPublishing.c"
+#line 1144 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) {
-	PublishingFlickrVisibilitySpecification* old;
+	PublishingFlickrVisibilitySpecification * old;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1156,17 +1159,17 @@ void publishing_flickr_value_take_visibility_specification (GValue* value, gpoin
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1160 "FlickrPublishing.c"
+#line 1163 "FlickrPublishing.c"
 	} else {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1164 "FlickrPublishing.c"
+#line 1167 "FlickrPublishing.c"
 	}
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1170 "FlickrPublishing.c"
+#line 1173 "FlickrPublishing.c"
 	}
 }
 
@@ -1176,24 +1179,24 @@ static void publishing_flickr_visibility_specification_class_init (PublishingFli
 	publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize;
-#line 1180 "FlickrPublishing.c"
+#line 1183 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1187 "FlickrPublishing.c"
+#line 1190 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj) {
+static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj) {
 	PublishingFlickrVisibilitySpecification * self;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1197 "FlickrPublishing.c"
+#line 1200 "FlickrPublishing.c"
 }
 
 
@@ -1212,18 +1215,18 @@ GType publishing_flickr_visibility_specification_get_type (void) {
 
 
 gpointer publishing_flickr_visibility_specification_ref (gpointer instance) {
-	PublishingFlickrVisibilitySpecification* self;
+	PublishingFlickrVisibilitySpecification * self;
 	self = instance;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1222 "FlickrPublishing.c"
+#line 1225 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_visibility_specification_unref (gpointer instance) {
-	PublishingFlickrVisibilitySpecification* self;
+	PublishingFlickrVisibilitySpecification * self;
 	self = instance;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1231,7 +1234,7 @@ void publishing_flickr_visibility_specification_unref (gpointer instance) {
 		PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1235 "FlickrPublishing.c"
+#line 1238 "FlickrPublishing.c"
 	}
 }
 
@@ -1242,21 +1245,21 @@ PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_co
 	self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1246 "FlickrPublishing.c"
+#line 1249 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) {
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS);
-#line 1253 "FlickrPublishing.c"
+#line 1256 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_publishing_parameters_init (GValue* value) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1260 "FlickrPublishing.c"
+#line 1263 "FlickrPublishing.c"
 }
 
 
@@ -1265,7 +1268,7 @@ static void publishing_flickr_value_publishing_parameters_free_value (GValue* va
 	if (value->data[0].v_pointer) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1269 "FlickrPublishing.c"
+#line 1272 "FlickrPublishing.c"
 	}
 }
 
@@ -1275,11 +1278,11 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal
 	if (src_value->data[0].v_pointer) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1279 "FlickrPublishing.c"
+#line 1282 "FlickrPublishing.c"
 	} else {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1283 "FlickrPublishing.c"
+#line 1286 "FlickrPublishing.c"
 	}
 }
 
@@ -1287,66 +1290,66 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal
 static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1291 "FlickrPublishing.c"
+#line 1294 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1298 "FlickrPublishing.c"
-		PublishingFlickrPublishingParameters* object;
+#line 1301 "FlickrPublishing.c"
+		PublishingFlickrPublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1305 "FlickrPublishing.c"
+#line 1308 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1309 "FlickrPublishing.c"
+#line 1312 "FlickrPublishing.c"
 		}
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object);
-#line 1313 "FlickrPublishing.c"
+#line 1316 "FlickrPublishing.c"
 	} else {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1317 "FlickrPublishing.c"
+#line 1320 "FlickrPublishing.c"
 	}
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1321 "FlickrPublishing.c"
+#line 1324 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFlickrPublishingParameters** object_p;
+	PublishingFlickrPublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1332 "FlickrPublishing.c"
+#line 1335 "FlickrPublishing.c"
 	}
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1338 "FlickrPublishing.c"
+#line 1341 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1342 "FlickrPublishing.c"
+#line 1345 "FlickrPublishing.c"
 	} else {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1346 "FlickrPublishing.c"
+#line 1349 "FlickrPublishing.c"
 	}
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1350 "FlickrPublishing.c"
+#line 1353 "FlickrPublishing.c"
 }
 
 
@@ -1360,7 +1363,7 @@ GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* nam
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1364 "FlickrPublishing.c"
+#line 1367 "FlickrPublishing.c"
 }
 
 
@@ -1369,12 +1372,12 @@ gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1373 "FlickrPublishing.c"
+#line 1376 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingFlickrPublishingParameters* old;
+	PublishingFlickrPublishingParameters * old;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1389,23 +1392,23 @@ void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer
 		value->data[0].v_pointer = v_object;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1393 "FlickrPublishing.c"
+#line 1396 "FlickrPublishing.c"
 	} else {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1397 "FlickrPublishing.c"
+#line 1400 "FlickrPublishing.c"
 	}
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1403 "FlickrPublishing.c"
+#line 1406 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingFlickrPublishingParameters* old;
+	PublishingFlickrPublishingParameters * old;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1418,17 +1421,17 @@ void publishing_flickr_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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1422 "FlickrPublishing.c"
+#line 1425 "FlickrPublishing.c"
 	} else {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1426 "FlickrPublishing.c"
+#line 1429 "FlickrPublishing.c"
 	}
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1432 "FlickrPublishing.c"
+#line 1435 "FlickrPublishing.c"
 	}
 }
 
@@ -1438,18 +1441,18 @@ static void publishing_flickr_publishing_parameters_class_init (PublishingFlickr
 	publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize;
-#line 1442 "FlickrPublishing.c"
+#line 1445 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) {
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1449 "FlickrPublishing.c"
+#line 1452 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters* obj) {
+static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj) {
 	PublishingFlickrPublishingParameters * self;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters);
@@ -1459,7 +1462,7 @@ static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPu
 	_g_free0 (self->username);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->visibility_specification);
-#line 1463 "FlickrPublishing.c"
+#line 1466 "FlickrPublishing.c"
 }
 
 
@@ -1478,18 +1481,18 @@ GType publishing_flickr_publishing_parameters_get_type (void) {
 
 
 gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) {
-	PublishingFlickrPublishingParameters* self;
+	PublishingFlickrPublishingParameters * self;
 	self = instance;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1488 "FlickrPublishing.c"
+#line 1491 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_parameters_unref (gpointer instance) {
-	PublishingFlickrPublishingParameters* self;
+	PublishingFlickrPublishingParameters * self;
 	self = instance;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1497,7 +1500,7 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1501 "FlickrPublishing.c"
+#line 1504 "FlickrPublishing.c"
 	}
 }
 
@@ -1505,23 +1508,23 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) {
 static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self);
-#line 1509 "FlickrPublishing.c"
+#line 1512 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingFlickrFlickrPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	PublishingFlickrSession* _tmp4_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp5_ = NULL;
-	PublishingAuthenticatorFactory* _tmp6_ = NULL;
-	PublishingAuthenticatorFactory* _tmp7_ = NULL;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	SpitPublishingAuthenticator* _tmp9_ = NULL;
-	SpitPublishingAuthenticator* _tmp10_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	PublishingFlickrSession* _tmp4_;
+	PublishingFlickrPublishingParameters* _tmp5_;
+	PublishingAuthenticatorFactory* _tmp6_;
+	PublishingAuthenticatorFactory* _tmp7_;
+	SpitPublishingPluginHost* _tmp8_;
+	SpitPublishingAuthenticator* _tmp9_;
+	SpitPublishingAuthenticator* _tmp10_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1578,21 +1581,21 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G
 	g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1582 "FlickrPublishing.c"
+#line 1585 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host);
-#line 1589 "FlickrPublishing.c"
+#line 1592 "FlickrPublishing.c"
 }
 
 
 SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self) {
 	SpitPublishingAuthenticator* result = NULL;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	SpitPublishingAuthenticator* _tmp1_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
+	SpitPublishingAuthenticator* _tmp1_;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
 #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1603,14 +1606,14 @@ SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticato
 	result = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1607 "FlickrPublishing.c"
+#line 1610 "FlickrPublishing.c"
 }
 
 
 static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1621,13 +1624,13 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata
 	result = _tmp1_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1625 "FlickrPublishing.c"
+#line 1628 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1636,57 +1639,57 @@ static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (Pu
 	_tmp1_ = strip_metadata;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 1640 "FlickrPublishing.c"
+#line 1643 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_variant_ref0 (gpointer self) {
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_variant_ref (self) : NULL;
-#line 1647 "FlickrPublishing.c"
+#line 1650 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	GHashTable* params = NULL;
-	SpitPublishingAuthenticator* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
+	SpitPublishingAuthenticator* _tmp1_;
+	GHashTable* _tmp2_;
 	GVariant* consumer_key = NULL;
 	GVariant* consumer_secret = NULL;
 	GVariant* auth_token = NULL;
 	GVariant* auth_token_secret = NULL;
 	GVariant* username = NULL;
-	GHashTable* _tmp3_ = NULL;
+	GHashTable* _tmp3_;
 	gconstpointer _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
+	GVariant* _tmp5_;
+	GHashTable* _tmp6_;
 	gconstpointer _tmp7_ = NULL;
-	GVariant* _tmp8_ = NULL;
-	PublishingFlickrSession* _tmp9_ = NULL;
-	GVariant* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GVariant* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GHashTable* _tmp14_ = NULL;
+	GVariant* _tmp8_;
+	PublishingFlickrSession* _tmp9_;
+	GVariant* _tmp10_;
+	const gchar* _tmp11_;
+	GVariant* _tmp12_;
+	const gchar* _tmp13_;
+	GHashTable* _tmp14_;
 	gconstpointer _tmp15_ = NULL;
-	GVariant* _tmp16_ = NULL;
-	GHashTable* _tmp17_ = NULL;
+	GVariant* _tmp16_;
+	GHashTable* _tmp17_;
 	gconstpointer _tmp18_ = NULL;
-	GVariant* _tmp19_ = NULL;
-	GHashTable* _tmp20_ = NULL;
+	GVariant* _tmp19_;
+	GHashTable* _tmp20_;
 	gconstpointer _tmp21_ = NULL;
-	GVariant* _tmp22_ = NULL;
-	PublishingFlickrSession* _tmp23_ = NULL;
-	GVariant* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	GVariant* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	GVariant* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp30_ = NULL;
-	PublishingFlickrSession* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
+	GVariant* _tmp22_;
+	PublishingFlickrSession* _tmp23_;
+	GVariant* _tmp24_;
+	const gchar* _tmp25_;
+	GVariant* _tmp26_;
+	const gchar* _tmp27_;
+	GVariant* _tmp28_;
+	const gchar* _tmp29_;
+	PublishingFlickrPublishingParameters* _tmp30_;
+	PublishingFlickrSession* _tmp31_;
+	gchar* _tmp32_;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1695,7 +1698,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish
 	if (!_tmp0_) {
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1699 "FlickrPublishing.c"
+#line 1702 "FlickrPublishing.c"
 	}
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_debug ("FlickrPublishing.vala:137: EVENT: a fully authenticated session has be" \
@@ -1818,33 +1821,33 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish
 	_g_variant_unref0 (consumer_key);
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (params);
-#line 1821 "FlickrPublishing.c"
+#line 1824 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 1828 "FlickrPublishing.c"
+#line 1831 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 1835 "FlickrPublishing.c"
+#line 1838 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1867,7 +1870,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P
 	if (!_tmp4_) {
 #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1870 "FlickrPublishing.c"
+#line 1873 "FlickrPublishing.c"
 	}
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \
@@ -1882,18 +1885,18 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P
 	publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_);
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1884 "FlickrPublishing.c"
+#line 1887 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	SpitPublishingPluginHost* _tmp5_;
+	GError* _tmp6_;
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1916,7 +1919,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi
 	if (!_tmp4_) {
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1918 "FlickrPublishing.c"
+#line 1921 "FlickrPublishing.c"
 	}
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_debug ("FlickrPublishing.vala:180: EVENT: account fetch transaction caused a n" \
@@ -1927,12 +1930,12 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi
 	_tmp6_ = err;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 1928 "FlickrPublishing.c"
+#line 1931 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1941,38 +1944,38 @@ static void publishing_flickr_flickr_publisher_on_account_info_available (Publis
 	if (!_tmp0_) {
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1942 "FlickrPublishing.c"
+#line 1945 "FlickrPublishing.c"
 	}
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \
 "able");
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self);
-#line 1948 "FlickrPublishing.c"
+#line 1951 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata);
-#line 1955 "FlickrPublishing.c"
+#line 1958 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self);
-#line 1962 "FlickrPublishing.c"
+#line 1965 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
-	PublishingFlickrPublishingOptionsPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	PublishingFlickrPublishingOptionsPane* _tmp0_;
+	guint _tmp1_;
+	PublishingFlickrPublishingOptionsPane* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1993,7 +1996,7 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis
 	if (!_tmp4_) {
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1993 "FlickrPublishing.c"
+#line 1996 "FlickrPublishing.c"
 	}
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_debug ("FlickrPublishing.vala:199: EVENT: user clicked the 'Publish' button in" \
@@ -2002,16 +2005,16 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis
 	_tmp5_ = strip_metadata;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_publish (self, _tmp5_);
-#line 2001 "FlickrPublishing.c"
+#line 2004 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self) {
-	PublishingFlickrPublishingOptionsPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
+	PublishingFlickrPublishingOptionsPane* _tmp0_;
+	guint _tmp1_;
+	PublishingFlickrPublishingOptionsPane* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2032,26 +2035,26 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout
 	if (!_tmp4_) {
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2031 "FlickrPublishing.c"
+#line 2034 "FlickrPublishing.c"
 	}
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_debug ("FlickrPublishing.vala:210: EVENT: user clicked the 'Logout' button in " \
 "the publishing options pane");
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_logout (self);
-#line 2037 "FlickrPublishing.c"
+#line 2040 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_ = FALSE;
-	gdouble _tmp1_ = 0.0;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gboolean _tmp0_;
+	gdouble _tmp1_;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2060,7 +2063,7 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish
 	if (!_tmp0_) {
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2058 "FlickrPublishing.c"
+#line 2061 "FlickrPublishing.c"
 	}
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -2083,31 +2086,31 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish
 	_tmp5_ = completed_fraction;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2080 "FlickrPublishing.c"
+#line 2083 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published);
-#line 2087 "FlickrPublishing.c"
+#line 2090 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2094 "FlickrPublishing.c"
+#line 2097 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	gboolean _tmp0_;
+	gint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportBatchUploader* _tmp4_;
+	guint _tmp5_;
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2118,7 +2121,7 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli
 	if (!_tmp0_) {
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2115 "FlickrPublishing.c"
+#line 2118 "FlickrPublishing.c"
 	}
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = num_published;
@@ -2139,20 +2142,20 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_success_pane (self);
-#line 2135 "FlickrPublishing.c"
+#line 2138 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	gboolean _tmp0_ = FALSE;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportBatchUploader* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
+	gboolean _tmp0_;
+	GError* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportBatchUploader* _tmp3_;
+	guint _tmp4_;
+	PublishingRESTSupportBatchUploader* _tmp5_;
+	guint _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GError* _tmp8_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2163,7 +2166,7 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr
 	if (!_tmp0_) {
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2159 "FlickrPublishing.c"
+#line 2162 "FlickrPublishing.c"
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = err;
@@ -2190,16 +2193,16 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr
 	_tmp8_ = err;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2185 "FlickrPublishing.c"
+#line 2188 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingFlickrAccountInfoFetchTransaction* txn = NULL;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	PublishingFlickrAccountInfoFetchTransaction* _tmp3_ = NULL;
+	PublishingFlickrSession* _tmp2_;
+	PublishingFlickrAccountInfoFetchTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
@@ -2224,7 +2227,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2218 "FlickrPublishing.c"
+#line 2221 "FlickrPublishing.c"
 	{
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2232,7 +2235,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2226 "FlickrPublishing.c"
+#line 2229 "FlickrPublishing.c"
 				goto __catch13_spit_publishing_publishing_error;
 			}
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2243,15 +2246,15 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 			g_clear_error (&_inner_error_);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2237 "FlickrPublishing.c"
+#line 2240 "FlickrPublishing.c"
 		}
 	}
 	goto __finally13;
 	__catch13_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2264,7 +2267,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 2258 "FlickrPublishing.c"
+#line 2261 "FlickrPublishing.c"
 	}
 	__finally13:
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2277,34 +2280,34 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 		g_clear_error (&_inner_error_);
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2271 "FlickrPublishing.c"
+#line 2274 "FlickrPublishing.c"
 	}
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2275 "FlickrPublishing.c"
+#line 2278 "FlickrPublishing.c"
 }
 
 
 static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
-	const gchar* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gint64 _tmp1_;
+#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2293 "FlickrPublishing.c"
+#line 2296 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
@@ -2315,39 +2318,39 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_debug ("FlickrPublishing.vala:270: ACTION: parsing account information from xm" \
 "l = '%s'", _tmp0_);
-#line 2308 "FlickrPublishing.c"
+#line 2311 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* response_doc = NULL;
-		const gchar* _tmp1_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
+		const gchar* _tmp1_;
+		PublishingRESTSupportXmlDocument* _tmp2_;
 		xmlNode* root_node = NULL;
-		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
-		xmlNode* _tmp4_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp3_;
+		xmlNode* _tmp4_;
 		xmlNode* user_node = NULL;
-		PublishingRESTSupportXmlDocument* _tmp5_ = NULL;
-		xmlNode* _tmp6_ = NULL;
-		xmlNode* _tmp7_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp5_;
+		xmlNode* _tmp6_;
+		xmlNode* _tmp7_;
 		gchar* is_pro_str = NULL;
-		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
-		xmlNode* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		gchar* _tmp10_;
 		xmlNode* bandwidth_node = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
-		xmlNode* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp11_;
+		xmlNode* _tmp12_;
+		xmlNode* _tmp13_;
 		gchar* remaining_kb_str = NULL;
-		PublishingRESTSupportXmlDocument* _tmp14_ = NULL;
-		xmlNode* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp14_;
+		xmlNode* _tmp15_;
+		gchar* _tmp16_;
 		PublishingFlickrUserKind user_kind = 0;
-		const gchar* _tmp17_ = NULL;
+		const gchar* _tmp17_;
 		gint64 quota_bytes_left = 0LL;
-		const gchar* _tmp20_ = NULL;
-		gint64 _tmp21_ = 0LL;
-		PublishingFlickrPublishingParameters* _tmp22_ = NULL;
-		gint64 _tmp23_ = 0LL;
-		PublishingFlickrPublishingParameters* _tmp24_ = NULL;
-		PublishingFlickrUserKind _tmp25_ = 0;
+		const gchar* _tmp20_;
+		gint64 _tmp21_;
+		PublishingFlickrPublishingParameters* _tmp22_;
+		gint64 _tmp23_;
+		PublishingFlickrPublishingParameters* _tmp24_;
+		PublishingFlickrUserKind _tmp25_;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2358,7 +2361,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2351 "FlickrPublishing.c"
+#line 2354 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2367,7 +2370,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			g_clear_error (&_inner_error_);
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2360 "FlickrPublishing.c"
+#line 2363 "FlickrPublishing.c"
 		}
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = response_doc;
@@ -2389,7 +2392,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2382 "FlickrPublishing.c"
+#line 2385 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2400,7 +2403,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			g_clear_error (&_inner_error_);
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2393 "FlickrPublishing.c"
+#line 2396 "FlickrPublishing.c"
 		}
 #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = response_doc;
@@ -2416,7 +2419,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2409 "FlickrPublishing.c"
+#line 2412 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
 #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2427,7 +2430,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			g_clear_error (&_inner_error_);
 #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2420 "FlickrPublishing.c"
+#line 2423 "FlickrPublishing.c"
 		}
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = response_doc;
@@ -2445,7 +2448,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2438 "FlickrPublishing.c"
+#line 2441 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2458,7 +2461,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			g_clear_error (&_inner_error_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2451 "FlickrPublishing.c"
+#line 2454 "FlickrPublishing.c"
 		}
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = response_doc;
@@ -2476,7 +2479,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2469 "FlickrPublishing.c"
+#line 2472 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2489,7 +2492,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			g_clear_error (&_inner_error_);
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2482 "FlickrPublishing.c"
+#line 2485 "FlickrPublishing.c"
 		}
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp17_ = is_pro_str;
@@ -2497,18 +2500,18 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		if (g_strcmp0 (_tmp17_, "0") == 0) {
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			user_kind = PUBLISHING_FLICKR_USER_KIND_FREE;
-#line 2490 "FlickrPublishing.c"
+#line 2493 "FlickrPublishing.c"
 		} else {
-			const gchar* _tmp18_ = NULL;
+			const gchar* _tmp18_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp18_ = is_pro_str;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (g_strcmp0 (_tmp18_, "1") == 0) {
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				user_kind = PUBLISHING_FLICKR_USER_KIND_PRO;
-#line 2499 "FlickrPublishing.c"
+#line 2502 "FlickrPublishing.c"
 			} else {
-				GError* _tmp19_ = NULL;
+				GError* _tmp19_;
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to determine if user has free or pro account");
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2521,7 +2524,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 				_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2514 "FlickrPublishing.c"
+#line 2517 "FlickrPublishing.c"
 					goto __catch14_spit_publishing_publishing_error;
 				}
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2536,7 +2539,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 				g_clear_error (&_inner_error_);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				return;
-#line 2529 "FlickrPublishing.c"
+#line 2532 "FlickrPublishing.c"
 			}
 		}
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2563,15 +2566,15 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		_g_free0 (is_pro_str);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2556 "FlickrPublishing.c"
+#line 2559 "FlickrPublishing.c"
 	}
 	goto __finally14;
 	__catch14_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp26_ = NULL;
-		SpitPublishingPluginHost* _tmp27_ = NULL;
-		GError* _tmp28_ = NULL;
+		GError* _tmp26_;
+		SpitPublishingPluginHost* _tmp27_;
+		GError* _tmp28_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2586,7 +2589,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 			_g_error_free0 (err);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2579 "FlickrPublishing.c"
+#line 2582 "FlickrPublishing.c"
 		}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = self->priv->host;
@@ -2598,7 +2601,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		_g_error_free0 (err);
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2591 "FlickrPublishing.c"
+#line 2594 "FlickrPublishing.c"
 	}
 	__finally14:
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2609,17 +2612,17 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		g_clear_error (&_inner_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2602 "FlickrPublishing.c"
+#line 2605 "FlickrPublishing.c"
 	}
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_info_available (self);
-#line 2606 "FlickrPublishing.c"
+#line 2609 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingAuthenticator* _tmp0_;
+	gboolean _tmp1_;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2631,36 +2634,36 @@ static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickr
 	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 2623 "FlickrPublishing.c"
-		SpitPublishingAuthenticator* _tmp2_ = NULL;
+#line 2626 "FlickrPublishing.c"
+		SpitPublishingAuthenticator* _tmp2_;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = self->priv->authenticator;
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_authenticator_logout (_tmp2_);
-#line 2629 "FlickrPublishing.c"
+#line 2632 "FlickrPublishing.c"
 	}
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 2635 "FlickrPublishing.c"
+#line 2638 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp9_ = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	SpitPublishingPublisherMediaType _tmp11_ = 0;
-	GtkBuilder* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	PublishingFlickrPublishingOptionsPane* _tmp14_ = NULL;
-	PublishingFlickrPublishingOptionsPane* _tmp15_ = NULL;
-	PublishingFlickrPublishingOptionsPane* _tmp16_ = NULL;
-	SpitPublishingPluginHost* _tmp17_ = NULL;
-	PublishingFlickrPublishingOptionsPane* _tmp18_ = NULL;
+	GtkBuilder* _tmp1_;
+	PublishingFlickrPublishingParameters* _tmp8_;
+	SpitPublishingPluginHost* _tmp9_;
+	SpitPublishingPublisherMediaType _tmp10_;
+	GtkBuilder* _tmp11_;
+	gboolean _tmp12_;
+	PublishingFlickrPublishingOptionsPane* _tmp13_;
+	PublishingFlickrPublishingOptionsPane* _tmp14_;
+	PublishingFlickrPublishingOptionsPane* _tmp15_;
+	SpitPublishingPluginHost* _tmp16_;
+	PublishingFlickrPublishingOptionsPane* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
@@ -2674,16 +2677,16 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 	_tmp1_ = gtk_builder_new ();
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	builder = _tmp1_;
-#line 2666 "FlickrPublishing.c"
+#line 2669 "FlickrPublishing.c"
 	{
-		GtkBuilder* _tmp2_ = NULL;
+		GtkBuilder* _tmp2_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = builder;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "flickr_publishing_options_pane.ui", &_inner_error_);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2675 "FlickrPublishing.c"
+#line 2678 "FlickrPublishing.c"
 			goto __catch15_g_error;
 		}
 	}
@@ -2691,12 +2694,11 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 	__catch15_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		SpitPublishingPluginHost* _tmp5_;
+		GError* _tmp6_;
+		GError* _tmp7_;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2710,16 +2712,14 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = self->priv->host;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n’t continue.");
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
+		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
+"n’t continue."));
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_);
+		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp8_);
+		_g_error_free0 (_tmp7_);
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2742,35 +2742,35 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 #line 2730 "FlickrPublishing.c"
 	}
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = self->priv->parameters;
+	_tmp8_ = self->priv->parameters;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = self->priv->host;
+	_tmp9_ = self->priv->host;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp10_);
+	_tmp10_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp9_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = builder;
+	_tmp11_ = builder;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
+	_tmp12_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = publishing_flickr_publishing_options_pane_new (self, _tmp9_, _tmp11_, _tmp12_, _tmp13_);
+	_tmp13_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, _tmp10_, _tmp11_, _tmp12_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->publishing_options_pane = _tmp14_;
+	self->priv->publishing_options_pane = _tmp13_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = self->priv->publishing_options_pane;
+	_tmp14_ = self->priv->publishing_options_pane;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp15_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp14_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = self->priv->publishing_options_pane;
+	_tmp15_ = self->priv->publishing_options_pane;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp16_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp15_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = self->priv->host;
+	_tmp16_ = self->priv->host;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = self->priv->publishing_options_pane;
+	_tmp17_ = self->priv->publishing_options_pane;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (builder);
 #line 2764 "FlickrPublishing.c"
@@ -2779,14 +2779,14 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 
 gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
 	gint result = 0;
-	SpitPublishingPublishable* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
-	GDateTime* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	GDateTime* _tmp4_ = NULL;
-	GDateTime* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	SpitPublishingPublishable* _tmp0_;
+	GDateTime* _tmp1_;
+	GDateTime* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	GDateTime* _tmp4_;
+	GDateTime* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2836,41 +2836,41 @@ static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_pu
 
 
 static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
-	gboolean _tmp0_ = FALSE;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
-	void* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	SpitPublishingProgressCallback _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	PublishingFlickrPublishingParameters* _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
+	void* _tmp6_;
+	GDestroyNotify _tmp7_;
+	SpitPublishingProgressCallback _tmp8_;
+	gboolean _tmp9_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp10_;
+	gint _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	GeeArrayList* sorted_list = NULL;
-	GeeArrayList* _tmp13_ = NULL;
-	SpitPublishingPublishable** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	GeeArrayList* _tmp18_ = NULL;
+	GeeArrayList* _tmp13_;
+	SpitPublishingPublishable** _tmp14_;
+	gint _tmp14__length1;
+	GeeArrayList* _tmp18_;
 	PublishingFlickrUploader* uploader = NULL;
-	PublishingFlickrSession* _tmp19_ = NULL;
-	GeeArrayList* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gpointer* _tmp22_ = NULL;
-	SpitPublishingPublishable** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	PublishingFlickrPublishingParameters* _tmp24_ = NULL;
-	gboolean _tmp25_ = FALSE;
-	PublishingFlickrUploader* _tmp26_ = NULL;
-	PublishingFlickrUploader* _tmp27_ = NULL;
-	PublishingFlickrUploader* _tmp28_ = NULL;
-	PublishingFlickrUploader* _tmp29_ = NULL;
-	PublishingFlickrUploader* _tmp30_ = NULL;
+	PublishingFlickrSession* _tmp19_;
+	GeeArrayList* _tmp20_;
+	gint _tmp21_;
+	gpointer* _tmp22_;
+	SpitPublishingPublishable** _tmp23_;
+	gint _tmp23__length1;
+	PublishingFlickrPublishingParameters* _tmp24_;
+	gboolean _tmp25_;
+	PublishingFlickrUploader* _tmp26_;
+	PublishingFlickrUploader* _tmp27_;
+	PublishingFlickrUploader* _tmp28_;
+	PublishingFlickrUploader* _tmp29_;
+	PublishingFlickrUploader* _tmp30_;
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2947,7 +2947,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
 #line 2936 "FlickrPublishing.c"
-			SpitPublishingPublishable* _tmp15_ = NULL;
+			SpitPublishingPublishable* _tmp15_;
 			SpitPublishingPublishable* p = NULL;
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
@@ -2955,8 +2955,8 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 			p = _tmp15_;
 #line 2943 "FlickrPublishing.c"
 			{
-				GeeArrayList* _tmp16_ = NULL;
-				SpitPublishingPublishable* _tmp17_ = NULL;
+				GeeArrayList* _tmp16_;
+				SpitPublishingPublishable* _tmp17_;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = sorted_list;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3018,8 +3018,8 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 
 
 static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3038,8 +3038,8 @@ static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingF
 
 gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3055,8 +3055,8 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli
 
 
 void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3071,8 +3071,8 @@ void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFli
 
 gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3088,8 +3088,8 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF
 
 
 void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3105,8 +3105,8 @@ void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingF
 static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3124,7 +3124,7 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic
 static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3138,7 +3138,7 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi
 
 
 static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3155,8 +3155,8 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl
 
 static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
 #line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3186,7 +3186,7 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish
 
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
-	PublishingFlickrSession* _tmp0_ = NULL;
+	PublishingFlickrSession* _tmp0_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3196,7 +3196,7 @@ static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublishe
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ != NULL) {
 #line 3184 "FlickrPublishing.c"
-		PublishingFlickrSession* _tmp1_ = NULL;
+		PublishingFlickrSession* _tmp1_;
 #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = self->priv->session;
 #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3224,13 +3224,13 @@ static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interfa
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_get_service;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_is_running;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start;
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_start;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop;
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_stop;
 #line 3220 "FlickrPublishing.c"
 }
 
@@ -3240,6 +3240,10 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl
 	self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3252,14 +3256,14 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl
 	self->priv->authenticator = NULL;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 3241 "FlickrPublishing.c"
+#line 3245 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_finalize (GObject* obj) {
+static void publishing_flickr_flickr_publisher_finalize (GObject * obj) {
 	PublishingFlickrFlickrPublisher * self;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	SpitPublishingAuthenticator* _tmp0_;
+	guint _tmp1_;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3290,7 +3294,7 @@ static void publishing_flickr_flickr_publisher_finalize (GObject* obj) {
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj);
-#line 3279 "FlickrPublishing.c"
+#line 3283 "FlickrPublishing.c"
 }
 
 
@@ -3310,17 +3314,17 @@ GType publishing_flickr_flickr_publisher_get_type (void) {
 
 PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingFlickrTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	PublishingFlickrSession* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingFlickrSession* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	PublishingFlickrSession* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	PublishingFlickrSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	PublishingFlickrSession* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingFlickrSession* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3367,31 +3371,31 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje
 	_g_free0 (_tmp10_);
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 3356 "FlickrPublishing.c"
+#line 3360 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method);
-#line 3363 "FlickrPublishing.c"
+#line 3367 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
 	PublishingFlickrTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
-	PublishingFlickrSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingFlickrSession* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	PublishingFlickrSession* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	PublishingFlickrSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp2_;
+	PublishingFlickrSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingFlickrSession* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	PublishingFlickrSession* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3442,21 +3446,21 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G
 	_g_free0 (_tmp11_);
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 3431 "FlickrPublishing.c"
+#line 3435 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method);
-#line 3438 "FlickrPublishing.c"
+#line 3442 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingFlickrTransaction * self;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingFlickrSession* _tmp1_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingFlickrSession* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction);
@@ -3478,7 +3482,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra
 			g_propagate_error (error, _inner_error_);
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3467 "FlickrPublishing.c"
+#line 3471 "FlickrPublishing.c"
 		} else {
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3486,7 +3490,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra
 			g_clear_error (&_inner_error_);
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3475 "FlickrPublishing.c"
+#line 3479 "FlickrPublishing.c"
 		}
 	}
 }
@@ -3495,22 +3499,22 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra
 gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp0_;
+	xmlNode* _tmp1_;
 	gchar* status = NULL;
-	xmlNode* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	xmlNode* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp6_;
 	xmlNode* errcode = NULL;
-	xmlNode* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	xmlNode* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	xmlNode* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	xmlNode* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
@@ -3530,8 +3534,8 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	_tmp4_ = status;
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 3519 "FlickrPublishing.c"
-		gchar* _tmp5_ = NULL;
+#line 3523 "FlickrPublishing.c"
+		gchar* _tmp5_;
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3540,7 +3544,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		_g_free0 (status);
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3529 "FlickrPublishing.c"
+#line 3533 "FlickrPublishing.c"
 	}
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = status;
@@ -3552,13 +3556,13 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		_g_free0 (status);
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3541 "FlickrPublishing.c"
+#line 3545 "FlickrPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
-		xmlNode* _tmp9_ = NULL;
-		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		xmlNode* _tmp10_;
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = doc;
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3571,7 +3575,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3560 "FlickrPublishing.c"
+#line 3564 "FlickrPublishing.c"
 				goto __catch16_spit_publishing_publishing_error;
 			}
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3582,17 +3586,17 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 			g_clear_error (&_inner_error_);
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3571 "FlickrPublishing.c"
+#line 3575 "FlickrPublishing.c"
 		}
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		errcode = _tmp7_;
-#line 3575 "FlickrPublishing.c"
+#line 3579 "FlickrPublishing.c"
 	}
 	goto __finally16;
 	__catch16_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp11_ = NULL;
+		gchar* _tmp11_;
 #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
 #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3607,7 +3611,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		_g_free0 (status);
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3596 "FlickrPublishing.c"
+#line 3600 "FlickrPublishing.c"
 	}
 	__finally16:
 #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3620,7 +3624,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		g_clear_error (&_inner_error_);
 #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return NULL;
-#line 3609 "FlickrPublishing.c"
+#line 3613 "FlickrPublishing.c"
 	}
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = errcode;
@@ -3648,7 +3652,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	_g_free0 (status);
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3637 "FlickrPublishing.c"
+#line 3641 "FlickrPublishing.c"
 }
 
 
@@ -3657,34 +3661,34 @@ static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_suppor
 	result = publishing_flickr_transaction_validate_xml (doc);
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3646 "FlickrPublishing.c"
+#line 3650 "FlickrPublishing.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3666 "FlickrPublishing.c"
+#line 3670 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 3673 "FlickrPublishing.c"
+#line 3677 "FlickrPublishing.c"
 }
 
 
@@ -3696,12 +3700,12 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 	g_return_val_if_fail (xml != NULL, NULL);
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = NULL;
-#line 3685 "FlickrPublishing.c"
+#line 3689 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-		const gchar* _tmp1_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
+		const gchar* _tmp1_;
+		PublishingRESTSupportXmlDocument* _tmp2_;
+		PublishingRESTSupportXmlDocument* _tmp3_;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3712,7 +3716,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3701 "FlickrPublishing.c"
+#line 3705 "FlickrPublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3723,7 +3727,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 			g_clear_error (&_inner_error_);
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3712 "FlickrPublishing.c"
+#line 3716 "FlickrPublishing.c"
 		}
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = _tmp0_;
@@ -3735,18 +3739,18 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 		_result_ = _tmp3_;
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 3724 "FlickrPublishing.c"
+#line 3728 "FlickrPublishing.c"
 	}
 	goto __finally17;
 	__catch17_spit_publishing_publishing_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gboolean _tmp8_;
+		gboolean _tmp9_;
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3767,10 +3771,10 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 		_g_free0 (_tmp7_);
 #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp9_) {
-#line 3756 "FlickrPublishing.c"
-			GError* _tmp10_ = NULL;
-			const gchar* _tmp11_ = NULL;
-			GError* _tmp12_ = NULL;
+#line 3760 "FlickrPublishing.c"
+			GError* _tmp10_;
+			const gchar* _tmp11_;
+			GError* _tmp12_;
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp10_ = e;
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3781,11 +3785,11 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 			_inner_error_ = _tmp12_;
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 3770 "FlickrPublishing.c"
+#line 3774 "FlickrPublishing.c"
 			goto __finally17;
 		} else {
-			GError* _tmp13_ = NULL;
-			GError* _tmp14_ = NULL;
+			GError* _tmp13_;
+			GError* _tmp14_;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp13_ = e;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3794,12 +3798,12 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 			_inner_error_ = _tmp14_;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 3783 "FlickrPublishing.c"
+#line 3787 "FlickrPublishing.c"
 			goto __finally17;
 		}
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 3788 "FlickrPublishing.c"
+#line 3792 "FlickrPublishing.c"
 	}
 	__finally17:
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3812,7 +3816,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 			_publishing_rest_support_xml_document_unref0 (_result_);
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3801 "FlickrPublishing.c"
+#line 3805 "FlickrPublishing.c"
 		} else {
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
@@ -3822,14 +3826,14 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 			g_clear_error (&_inner_error_);
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3811 "FlickrPublishing.c"
+#line 3815 "FlickrPublishing.c"
 		}
 	}
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3818 "FlickrPublishing.c"
+#line 3822 "FlickrPublishing.c"
 }
 
 
@@ -3837,8 +3841,8 @@ static void publishing_flickr_transaction_class_init (PublishingFlickrTransactio
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_flickr_transaction_real_execute;
-#line 3827 "FlickrPublishing.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_transaction_real_execute;
+#line 3831 "FlickrPublishing.c"
 }
 
 
@@ -3860,10 +3864,10 @@ GType publishing_flickr_transaction_get_type (void) {
 
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) {
 	PublishingFlickrAccountInfoFetchTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-	PublishingFlickrSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	PublishingFlickrSession* _tmp0_;
+	PublishingFlickrSession* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3884,21 +3888,21 @@ PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetc
 	_g_free0 (_tmp3_);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 3873 "FlickrPublishing.c"
+#line 3877 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) {
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_account_info_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, session);
-#line 3880 "FlickrPublishing.c"
+#line 3884 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) {
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3887 "FlickrPublishing.c"
+#line 3891 "FlickrPublishing.c"
 }
 
 
@@ -3921,79 +3925,79 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
 static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) {
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_parameters_ref (self) : NULL;
-#line 3910 "FlickrPublishing.c"
+#line 3914 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3917 "FlickrPublishing.c"
+#line 3921 "FlickrPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	var = (g_free (var), NULL);
-#line 3924 "FlickrPublishing.c"
+#line 3928 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingFlickrUploadTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp2_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp3_ = NULL;
-	PublishingFlickrSession* _tmp4_ = NULL;
-	PublishingFlickrSession* _tmp5_ = NULL;
-	PublishingRESTSupportArgument** _tmp6_ = NULL;
-	PublishingFlickrSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingFlickrSession* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	PublishingFlickrSession* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	PublishingFlickrSession* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp19_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp24_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp29_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gchar* _tmp32_ = NULL;
-	gchar* _tmp33_ = NULL;
+	PublishingFlickrSession* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	PublishingFlickrPublishingParameters* _tmp2_;
+	PublishingFlickrPublishingParameters* _tmp3_;
+	PublishingFlickrSession* _tmp4_;
+	PublishingFlickrSession* _tmp5_;
+	PublishingRESTSupportArgument** _tmp6_;
+	PublishingFlickrSession* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingFlickrSession* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	PublishingFlickrSession* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	PublishingFlickrSession* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	PublishingFlickrPublishingParameters* _tmp19_;
+	PublishingFlickrVisibilitySpecification* _tmp20_;
+	gint _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	PublishingFlickrPublishingParameters* _tmp24_;
+	PublishingFlickrVisibilitySpecification* _tmp25_;
+	gint _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
+	PublishingFlickrPublishingParameters* _tmp29_;
+	PublishingFlickrVisibilitySpecification* _tmp30_;
+	gint _tmp31_;
+	gchar* _tmp32_;
+	gchar* _tmp33_;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp34_ = NULL;
-	GEqualFunc _tmp35_ = NULL;
-	GHashTable* _tmp36_ = NULL;
+	GHashFunc _tmp34_;
+	GEqualFunc _tmp35_;
+	GHashTable* _tmp36_;
 	gchar* filename = NULL;
-	SpitPublishingPublishable* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
+	SpitPublishingPublishable* _tmp37_;
+	gchar* _tmp38_;
 	gboolean _tmp39_ = FALSE;
-	const gchar* _tmp40_ = NULL;
-	GHashTable* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	SpitPublishingPublishable* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
-	GHashTable* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	GHashTable* _tmp53_ = NULL;
+	const gchar* _tmp40_;
+	GHashTable* _tmp44_;
+	gchar* _tmp45_;
+	SpitPublishingPublishable* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	GHashTable* _tmp50_;
+	gchar* _tmp51_;
+	gchar* _tmp52_;
+	GHashTable* _tmp53_;
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4140,20 +4144,20 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc
 	if (_tmp40_ == NULL) {
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp39_ = TRUE;
-#line 4129 "FlickrPublishing.c"
+#line 4133 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp41_ = NULL;
+		const gchar* _tmp41_;
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp41_ = filename;
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp39_ = g_strcmp0 (_tmp41_, "") == 0;
-#line 4136 "FlickrPublishing.c"
+#line 4140 "FlickrPublishing.c"
 	}
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp39_) {
-#line 4140 "FlickrPublishing.c"
-		SpitPublishingPublishable* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
+#line 4144 "FlickrPublishing.c"
+		SpitPublishingPublishable* _tmp42_;
+		gchar* _tmp43_;
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp42_ = publishable;
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4162,7 +4166,7 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc
 		_g_free0 (filename);
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		filename = _tmp43_;
-#line 4151 "FlickrPublishing.c"
+#line 4155 "FlickrPublishing.c"
 	}
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp44_ = disposition_table;
@@ -4198,40 +4202,40 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc
 	_g_hash_table_unref0 (disposition_table);
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 4187 "FlickrPublishing.c"
+#line 4191 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 4194 "FlickrPublishing.c"
+#line 4198 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void _vala_array_add19 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 4205 "FlickrPublishing.c"
+#line 4209 "FlickrPublishing.c"
 	}
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 4211 "FlickrPublishing.c"
+#line 4215 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value) {
-	PublishingRESTSupportArgument** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportArgument* _tmp3_ = NULL;
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportArgument* _tmp3_;
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self));
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4250,14 +4254,14 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add19 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 4239 "FlickrPublishing.c"
+#line 4243 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 4246 "FlickrPublishing.c"
+#line 4250 "FlickrPublishing.c"
 }
 
 
@@ -4268,28 +4272,28 @@ static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportAr
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 4257 "FlickrPublishing.c"
-		PublishingRESTSupportArgument* _tmp0_ = NULL;
+#line 4261 "FlickrPublishing.c"
+		PublishingRESTSupportArgument* _tmp0_;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result[i] = _tmp0_;
-#line 4263 "FlickrPublishing.c"
+#line 4267 "FlickrPublishing.c"
 	}
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4267 "FlickrPublishing.c"
+#line 4271 "FlickrPublishing.c"
 }
 
 
 PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1) {
 	PublishingRESTSupportArgument** result = NULL;
-	PublishingRESTSupportArgument** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingRESTSupportArgument** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingRESTSupportArgument** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	PublishingRESTSupportArgument** _tmp1_;
+	gint _tmp1__length1;
+	PublishingRESTSupportArgument** _tmp2_;
+	gint _tmp2__length1;
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4308,74 +4312,74 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori
 	if (result_length1) {
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 4297 "FlickrPublishing.c"
+#line 4301 "FlickrPublishing.c"
 	}
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4303 "FlickrPublishing.c"
+#line 4307 "FlickrPublishing.c"
 }
 
 
 gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_strdup ("OAuth ");
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 4317 "FlickrPublishing.c"
+#line 4321 "FlickrPublishing.c"
 	{
 		gint i = 0;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 4322 "FlickrPublishing.c"
+#line 4326 "FlickrPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp1_ = TRUE;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 4329 "FlickrPublishing.c"
-				gint _tmp3_ = 0;
-				PublishingRESTSupportArgument** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				const gchar* _tmp5_ = NULL;
-				PublishingRESTSupportArgument** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				PublishingRESTSupportArgument* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
-				PublishingRESTSupportArgument** _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				gint _tmp15_ = 0;
-				PublishingRESTSupportArgument* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				PublishingRESTSupportArgument** _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
+#line 4333 "FlickrPublishing.c"
+				gint _tmp3_;
+				PublishingRESTSupportArgument** _tmp4_;
+				gint _tmp4__length1;
+				const gchar* _tmp5_;
+				PublishingRESTSupportArgument** _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				PublishingRESTSupportArgument* _tmp8_;
+				const gchar* _tmp9_;
+				gchar* _tmp10_;
+				const gchar* _tmp11_;
+				gchar* _tmp12_;
+				const gchar* _tmp13_;
+				PublishingRESTSupportArgument** _tmp14_;
+				gint _tmp14__length1;
+				gint _tmp15_;
+				PublishingRESTSupportArgument* _tmp16_;
+				const gchar* _tmp17_;
+				gchar* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				gchar* _tmp21_;
+				gchar* _tmp22_;
+				gint _tmp23_;
+				PublishingRESTSupportArgument** _tmp24_;
+				gint _tmp24__length1;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp1_) {
-#line 4358 "FlickrPublishing.c"
-					gint _tmp2_ = 0;
+#line 4362 "FlickrPublishing.c"
+					gint _tmp2_;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp2_ = i;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp2_ + 1;
-#line 4364 "FlickrPublishing.c"
+#line 4368 "FlickrPublishing.c"
 				}
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp1_ = FALSE;
@@ -4389,7 +4393,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 4378 "FlickrPublishing.c"
+#line 4382 "FlickrPublishing.c"
 				}
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = _result_;
@@ -4455,9 +4459,9 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 				_tmp24__length1 = self->priv->auth_header_fields_length1;
 #line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 4444 "FlickrPublishing.c"
-					const gchar* _tmp25_ = NULL;
-					gchar* _tmp26_ = NULL;
+#line 4448 "FlickrPublishing.c"
+					const gchar* _tmp25_;
+					gchar* _tmp26_;
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = _result_;
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4466,7 +4470,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 					_g_free0 (_result_);
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_result_ = _tmp26_;
-#line 4455 "FlickrPublishing.c"
+#line 4459 "FlickrPublishing.c"
 				}
 			}
 		}
@@ -4475,15 +4479,15 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 	result = _result_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4464 "FlickrPublishing.c"
+#line 4468 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingFlickrUploadTransaction * self;
-	PublishingFlickrSession* _tmp0_ = NULL;
+	PublishingFlickrSession* _tmp0_;
 	gchar* authorization_header = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
@@ -4512,7 +4516,7 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup
 			_g_free0 (authorization_header);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 4500 "FlickrPublishing.c"
+#line 4504 "FlickrPublishing.c"
 		} else {
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (authorization_header);
@@ -4522,12 +4526,12 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 4510 "FlickrPublishing.c"
+#line 4514 "FlickrPublishing.c"
 		}
 	}
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (authorization_header);
-#line 4515 "FlickrPublishing.c"
+#line 4519 "FlickrPublishing.c"
 }
 
 
@@ -4539,19 +4543,19 @@ static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUpl
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate));
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_flickr_upload_transaction_real_execute;
-#line 4528 "FlickrPublishing.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_upload_transaction_real_execute;
+#line 4532 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) {
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4535 "FlickrPublishing.c"
+#line 4539 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingFlickrUploadTransaction * self;
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
@@ -4563,7 +4567,7 @@ static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupport
 	self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj);
-#line 4551 "FlickrPublishing.c"
+#line 4555 "FlickrPublishing.c"
 }
 
 
@@ -4585,14 +4589,14 @@ PublishingFlickrSession* publishing_flickr_session_construct (GType object_type)
 	self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL);
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 4573 "FlickrPublishing.c"
+#line 4577 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrSession* publishing_flickr_session_new (void) {
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION);
-#line 4580 "FlickrPublishing.c"
+#line 4584 "FlickrPublishing.c"
 }
 
 
@@ -4601,52 +4605,52 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp2_;
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->access_phase_token;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 4596 "FlickrPublishing.c"
-		const gchar* _tmp3_ = NULL;
+#line 4600 "FlickrPublishing.c"
+		const gchar* _tmp3_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = self->priv->access_phase_token_secret;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 4602 "FlickrPublishing.c"
+#line 4606 "FlickrPublishing.c"
 	} else {
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = FALSE;
-#line 4606 "FlickrPublishing.c"
+#line 4610 "FlickrPublishing.c"
 	}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 4610 "FlickrPublishing.c"
-		const gchar* _tmp4_ = NULL;
+#line 4614 "FlickrPublishing.c"
+		const gchar* _tmp4_;
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->username;
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 4616 "FlickrPublishing.c"
+#line 4620 "FlickrPublishing.c"
 	} else {
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 4620 "FlickrPublishing.c"
+#line 4624 "FlickrPublishing.c"
 	}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4626 "FlickrPublishing.c"
+#line 4630 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4669,91 +4673,91 @@ void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* sel
 	_g_free0 (self->priv->consumer_secret);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->consumer_secret = _tmp3_;
-#line 4657 "FlickrPublishing.c"
+#line 4661 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 4664 "FlickrPublishing.c"
+#line 4668 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add20 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 4675 "FlickrPublishing.c"
+#line 4679 "FlickrPublishing.c"
 	}
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 4681 "FlickrPublishing.c"
+#line 4685 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn) {
 	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	PublishingRESTSupportArgument** _tmp8_ = NULL;
-	gint base_string_arguments_length1 = 0;
-	gint _base_string_arguments_size_ = 0;
+	PublishingRESTSupportTransaction* _tmp6_;
+	gint _tmp7_;
+	PublishingRESTSupportArgument** _tmp8_;
+	gint base_string_arguments_length1;
+	gint _base_string_arguments_size_;
 	PublishingFlickrUploadTransaction* upload_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp9_ = NULL;
-	PublishingFlickrUploadTransaction* _tmp10_ = NULL;
-	PublishingFlickrUploadTransaction* _tmp11_ = NULL;
+	PublishingRESTSupportTransaction* _tmp9_;
+	PublishingFlickrUploadTransaction* _tmp10_;
+	PublishingFlickrUploadTransaction* _tmp11_;
 	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	gint _tmp21_ = 0;
-	PublishingRESTSupportArgument** _tmp22_ = NULL;
-	gint sorted_args_length1 = 0;
-	gint _sorted_args_size_ = 0;
+	PublishingRESTSupportArgument** _tmp20_;
+	gint _tmp20__length1;
+	gint _tmp21_;
+	PublishingRESTSupportArgument** _tmp22_;
+	gint sorted_args_length1;
+	gint _sorted_args_size_;
 	gchar* arguments_string = NULL;
-	gchar* _tmp23_ = NULL;
+	gchar* _tmp23_;
 	gchar* signing_key = NULL;
-	const gchar* _tmp46_ = NULL;
+	const gchar* _tmp46_;
 	gchar* signature_base_string = NULL;
-	const gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	PublishingRESTSupportTransaction* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	const gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	gchar* _tmp70_ = NULL;
-	const gchar* _tmp71_ = NULL;
-	const gchar* _tmp72_ = NULL;
+	const gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	PublishingRESTSupportTransaction* _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
+	gchar* _tmp62_;
+	gchar* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
+	const gchar* _tmp66_;
+	gchar* _tmp67_;
+	gchar* _tmp68_;
+	gchar* _tmp69_;
+	gchar* _tmp70_;
+	const gchar* _tmp71_;
+	const gchar* _tmp72_;
 	gchar* signature = NULL;
-	const gchar* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	const gchar* _tmp76_ = NULL;
-	gchar* _tmp77_ = NULL;
-	const gchar* _tmp78_ = NULL;
-	PublishingFlickrUploadTransaction* _tmp79_ = NULL;
+	const gchar* _tmp73_;
+	const gchar* _tmp74_;
+	gchar* _tmp75_;
+	const gchar* _tmp76_;
+	gchar* _tmp77_;
+	const gchar* _tmp78_;
+	PublishingFlickrUploadTransaction* _tmp79_;
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4798,15 +4802,15 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	_tmp11_ = upload_txn;
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp11_ != NULL) {
-#line 4786 "FlickrPublishing.c"
+#line 4790 "FlickrPublishing.c"
 		PublishingRESTSupportArgument** auth_header_args = NULL;
-		PublishingFlickrUploadTransaction* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		PublishingRESTSupportArgument** _tmp14_ = NULL;
-		gint auth_header_args_length1 = 0;
-		gint _auth_header_args_size_ = 0;
-		PublishingRESTSupportArgument** _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
+		PublishingFlickrUploadTransaction* _tmp12_;
+		gint _tmp13_;
+		PublishingRESTSupportArgument** _tmp14_;
+		gint auth_header_args_length1;
+		gint _auth_header_args_size_;
+		PublishingRESTSupportArgument** _tmp15_;
+		gint _tmp15__length1;
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_debug ("FlickrPublishing.vala:644: %s", "this transaction is an UploadTransaction; including Authorization head" \
 "er " "fields in signature base string");
@@ -4824,7 +4828,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 		_tmp15_ = auth_header_args;
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15__length1 = auth_header_args_length1;
-#line 4811 "FlickrPublishing.c"
+#line 4815 "FlickrPublishing.c"
 		{
 			PublishingRESTSupportArgument** arg_collection = NULL;
 			gint arg_collection_length1 = 0;
@@ -4836,19 +4840,19 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 			arg_collection_length1 = _tmp15__length1;
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) {
-#line 4823 "FlickrPublishing.c"
-				PublishingRESTSupportArgument* _tmp16_ = NULL;
+#line 4827 "FlickrPublishing.c"
+				PublishingRESTSupportArgument* _tmp16_;
 				PublishingRESTSupportArgument* arg = NULL;
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				arg = _tmp16_;
-#line 4830 "FlickrPublishing.c"
+#line 4834 "FlickrPublishing.c"
 				{
-					PublishingRESTSupportArgument** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-					PublishingRESTSupportArgument* _tmp18_ = NULL;
-					PublishingRESTSupportArgument* _tmp19_ = NULL;
+					PublishingRESTSupportArgument** _tmp17_;
+					gint _tmp17__length1;
+					PublishingRESTSupportArgument* _tmp18_;
+					PublishingRESTSupportArgument* _tmp19_;
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp17_ = base_string_arguments;
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4861,13 +4865,13 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 					_vala_array_add20 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_);
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_publishing_rest_support_argument_unref0 (arg);
-#line 4848 "FlickrPublishing.c"
+#line 4852 "FlickrPublishing.c"
 				}
 			}
 		}
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4854 "FlickrPublishing.c"
+#line 4858 "FlickrPublishing.c"
 	}
 #line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = base_string_arguments;
@@ -4885,50 +4889,50 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	_tmp23_ = g_strdup ("");
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	arguments_string = _tmp23_;
-#line 4872 "FlickrPublishing.c"
+#line 4876 "FlickrPublishing.c"
 	{
 		gint i = 0;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 4877 "FlickrPublishing.c"
+#line 4881 "FlickrPublishing.c"
 		{
 			gboolean _tmp24_ = FALSE;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp24_ = TRUE;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 4884 "FlickrPublishing.c"
-				gint _tmp26_ = 0;
-				PublishingRESTSupportArgument** _tmp27_ = NULL;
-				gint _tmp27__length1 = 0;
-				const gchar* _tmp28_ = NULL;
-				PublishingRESTSupportArgument** _tmp29_ = NULL;
-				gint _tmp29__length1 = 0;
-				gint _tmp30_ = 0;
-				PublishingRESTSupportArgument* _tmp31_ = NULL;
-				const gchar* _tmp32_ = NULL;
-				gchar* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
-				PublishingRESTSupportArgument** _tmp35_ = NULL;
-				gint _tmp35__length1 = 0;
-				gint _tmp36_ = 0;
-				PublishingRESTSupportArgument* _tmp37_ = NULL;
-				const gchar* _tmp38_ = NULL;
-				gchar* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
-				gchar* _tmp41_ = NULL;
-				gint _tmp42_ = 0;
-				PublishingRESTSupportArgument** _tmp43_ = NULL;
-				gint _tmp43__length1 = 0;
+#line 4888 "FlickrPublishing.c"
+				gint _tmp26_;
+				PublishingRESTSupportArgument** _tmp27_;
+				gint _tmp27__length1;
+				const gchar* _tmp28_;
+				PublishingRESTSupportArgument** _tmp29_;
+				gint _tmp29__length1;
+				gint _tmp30_;
+				PublishingRESTSupportArgument* _tmp31_;
+				const gchar* _tmp32_;
+				gchar* _tmp33_;
+				gchar* _tmp34_;
+				PublishingRESTSupportArgument** _tmp35_;
+				gint _tmp35__length1;
+				gint _tmp36_;
+				PublishingRESTSupportArgument* _tmp37_;
+				const gchar* _tmp38_;
+				gchar* _tmp39_;
+				gchar* _tmp40_;
+				gchar* _tmp41_;
+				gint _tmp42_;
+				PublishingRESTSupportArgument** _tmp43_;
+				gint _tmp43__length1;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp24_) {
-#line 4909 "FlickrPublishing.c"
-					gint _tmp25_ = 0;
+#line 4913 "FlickrPublishing.c"
+					gint _tmp25_;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = i;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp25_ + 1;
-#line 4915 "FlickrPublishing.c"
+#line 4919 "FlickrPublishing.c"
 				}
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24_ = FALSE;
@@ -4942,7 +4946,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 				if (!(_tmp26_ < _tmp27__length1)) {
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 4929 "FlickrPublishing.c"
+#line 4933 "FlickrPublishing.c"
 				}
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp28_ = arguments_string;
@@ -4992,9 +4996,9 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 				_tmp43__length1 = sorted_args_length1;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp42_ < (_tmp43__length1 - 1)) {
-#line 4979 "FlickrPublishing.c"
-					const gchar* _tmp44_ = NULL;
-					gchar* _tmp45_ = NULL;
+#line 4983 "FlickrPublishing.c"
+					const gchar* _tmp44_;
+					gchar* _tmp45_;
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp44_ = arguments_string;
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5003,7 +5007,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 					_g_free0 (arguments_string);
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					arguments_string = _tmp45_;
-#line 4990 "FlickrPublishing.c"
+#line 4994 "FlickrPublishing.c"
 				}
 			}
 		}
@@ -5014,12 +5018,12 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	_tmp46_ = self->priv->access_phase_token_secret;
 #line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp46_ != NULL) {
-#line 5001 "FlickrPublishing.c"
-		const gchar* _tmp47_ = NULL;
-		gchar* _tmp48_ = NULL;
-		gchar* _tmp49_ = NULL;
-		const gchar* _tmp50_ = NULL;
-		gchar* _tmp51_ = NULL;
+#line 5005 "FlickrPublishing.c"
+		const gchar* _tmp47_;
+		gchar* _tmp48_;
+		gchar* _tmp49_;
+		const gchar* _tmp50_;
+		gchar* _tmp51_;
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_debug ("FlickrPublishing.vala:666: access phase token secret available; using " \
 "it as signing key");
@@ -5039,10 +5043,10 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 		signing_key = _tmp51_;
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp49_);
-#line 5025 "FlickrPublishing.c"
+#line 5029 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp52_ = NULL;
-		gchar* _tmp53_ = NULL;
+		const gchar* _tmp52_;
+		gchar* _tmp53_;
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_debug ("FlickrPublishing.vala:670: %s", "neither access phase nor request phase token secrets available; using " \
 "API " "key as signing key");
@@ -5054,7 +5058,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 		_g_free0 (signing_key);
 #line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		signing_key = _tmp53_;
-#line 5039 "FlickrPublishing.c"
+#line 5043 "FlickrPublishing.c"
 	}
 #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp54_ = http_method;
@@ -5136,26 +5140,26 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	_tmp79_ = upload_txn;
 #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp79_ != NULL) {
-#line 5121 "FlickrPublishing.c"
-		PublishingFlickrUploadTransaction* _tmp80_ = NULL;
-		const gchar* _tmp81_ = NULL;
+#line 5125 "FlickrPublishing.c"
+		PublishingFlickrUploadTransaction* _tmp80_;
+		const gchar* _tmp81_;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp80_ = upload_txn;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp81_ = signature;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_upload_transaction_add_authorization_header_field (_tmp80_, "oauth_signature", _tmp81_);
-#line 5130 "FlickrPublishing.c"
+#line 5134 "FlickrPublishing.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp82_ = NULL;
-		const gchar* _tmp83_ = NULL;
+		PublishingRESTSupportTransaction* _tmp82_;
+		const gchar* _tmp83_;
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp82_ = txn;
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp83_ = signature;
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_transaction_add_argument (_tmp82_, "oauth_signature", _tmp83_);
-#line 5140 "FlickrPublishing.c"
+#line 5144 "FlickrPublishing.c"
 	}
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature);
@@ -5173,17 +5177,17 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (http_method);
-#line 5158 "FlickrPublishing.c"
+#line 5162 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
 #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5218,25 +5222,25 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes
 	self->priv->username = _tmp5_;
 #line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 5203 "FlickrPublishing.c"
+#line 5207 "FlickrPublishing.c"
 }
 
 
 gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) {
 	gchar* result = NULL;
 	GTimeVal currtime = {0};
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GTimeVal _tmp4_ = {0};
-	glong _tmp5_ = 0L;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GTimeVal _tmp4_;
+	glong _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
 #line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5277,50 +5281,50 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self)
 	result = _tmp11_;
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5262 "FlickrPublishing.c"
+#line 5266 "FlickrPublishing.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 5285 "FlickrPublishing.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 5289 "FlickrPublishing.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 5293 "FlickrPublishing.c"
+#line 5297 "FlickrPublishing.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 5305 "FlickrPublishing.c"
+#line 5309 "FlickrPublishing.c"
 	}
 }
 
@@ -5329,133 +5333,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 5329 "FlickrPublishing.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 5333 "FlickrPublishing.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 5335 "FlickrPublishing.c"
+#line 5339 "FlickrPublishing.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 5339 "FlickrPublishing.c"
+#line 5343 "FlickrPublishing.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 5343 "FlickrPublishing.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 5347 "FlickrPublishing.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 5355 "FlickrPublishing.c"
+#line 5359 "FlickrPublishing.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 5365 "FlickrPublishing.c"
+#line 5369 "FlickrPublishing.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 5371 "FlickrPublishing.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 5375 "FlickrPublishing.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 5385 "FlickrPublishing.c"
+#line 5389 "FlickrPublishing.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 5395 "FlickrPublishing.c"
+#line 5399 "FlickrPublishing.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 5401 "FlickrPublishing.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 5405 "FlickrPublishing.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 5410 "FlickrPublishing.c"
+#line 5414 "FlickrPublishing.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 5430 "FlickrPublishing.c"
+#line 5434 "FlickrPublishing.c"
 }
 
 
 gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self) {
 	gchar* result = NULL;
-	gint64 _tmp0_ = 0LL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
 #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5474,15 +5478,15 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s
 	result = _tmp4_;
 #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5459 "FlickrPublishing.c"
+#line 5463 "FlickrPublishing.c"
 }
 
 
 gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
 #line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5497,15 +5501,15 @@ gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self
 	result = _tmp2_;
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5482 "FlickrPublishing.c"
+#line 5486 "FlickrPublishing.c"
 }
 
 
 gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
 #line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5520,15 +5524,15 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession
 	result = _tmp2_;
 #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5505 "FlickrPublishing.c"
+#line 5509 "FlickrPublishing.c"
 }
 
 
 gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) {
 	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
 #line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5543,7 +5547,7 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) {
 	result = _tmp2_;
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5528 "FlickrPublishing.c"
+#line 5532 "FlickrPublishing.c"
 }
 
 
@@ -5555,8 +5559,8 @@ static void publishing_flickr_session_class_init (PublishingFlickrSessionClass *
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate));
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_flickr_session_real_is_authenticated;
-#line 5541 "FlickrPublishing.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_flickr_session_real_is_authenticated;
+#line 5545 "FlickrPublishing.c"
 }
 
 
@@ -5573,11 +5577,11 @@ static void publishing_flickr_session_instance_init (PublishingFlickrSession * s
 	self->priv->consumer_key = NULL;
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->consumer_secret = NULL;
-#line 5558 "FlickrPublishing.c"
+#line 5562 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj) {
 	PublishingFlickrSession * self;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
@@ -5593,7 +5597,7 @@ static void publishing_flickr_session_finalize (PublishingRESTSupportSession* ob
 	_g_free0 (self->priv->consumer_secret);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj);
-#line 5578 "FlickrPublishing.c"
+#line 5582 "FlickrPublishing.c"
 }
 
 
@@ -5612,102 +5616,100 @@ GType publishing_flickr_session_get_type (void) {
 static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5597 "FlickrPublishing.c"
+#line 5601 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5604 "FlickrPublishing.c"
+#line 5608 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5611 "FlickrPublishing.c"
+#line 5615 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5618 "FlickrPublishing.c"
+#line 5622 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
 	PublishingFlickrPublishingOptionsPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GSList* _tmp4_ = NULL;
-	GSList* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GtkBuilder* _tmp7_ = NULL;
-	GObject* _tmp8_ = NULL;
-	GtkBox* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkBuilder* _tmp13_ = NULL;
-	GObject* _tmp14_ = NULL;
-	GtkLabel* _tmp15_ = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	GtkBuilder* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkButton* _tmp21_ = NULL;
-	GtkBuilder* _tmp22_ = NULL;
-	GObject* _tmp23_ = NULL;
-	GtkComboBoxText* _tmp24_ = NULL;
-	GtkBuilder* _tmp25_ = NULL;
-	GObject* _tmp26_ = NULL;
-	GtkComboBoxText* _tmp27_ = NULL;
-	GtkBuilder* _tmp28_ = NULL;
-	GObject* _tmp29_ = NULL;
-	GtkLabel* _tmp30_ = NULL;
-	GtkBuilder* _tmp31_ = NULL;
-	GObject* _tmp32_ = NULL;
-	GtkCheckButton* _tmp33_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp34_ = NULL;
-	SpitPublishingAuthenticator* _tmp35_ = NULL;
-	SpitPublishingAuthenticator* _tmp36_ = NULL;
-	gboolean _tmp37_ = FALSE;
-	gboolean _tmp38_ = FALSE;
-	PublishingFlickrPublishingParameters* _tmp43_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp44_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp45_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp46_ = NULL;
-	SpitPublishingPublisherMediaType _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
+	GtkBuilder* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GSList* _tmp4_;
+	GSList* _tmp5_;
+	guint _tmp6_;
+	GtkBuilder* _tmp7_;
+	GObject* _tmp8_;
+	GtkBox* _tmp9_;
+	GtkBuilder* _tmp10_;
+	GObject* _tmp11_;
+	GtkLabel* _tmp12_;
+	GtkBuilder* _tmp13_;
+	GObject* _tmp14_;
+	GtkLabel* _tmp15_;
+	GtkBuilder* _tmp16_;
+	GObject* _tmp17_;
+	GtkButton* _tmp18_;
+	GtkBuilder* _tmp19_;
+	GObject* _tmp20_;
+	GtkButton* _tmp21_;
+	GtkBuilder* _tmp22_;
+	GObject* _tmp23_;
+	GtkComboBoxText* _tmp24_;
+	GtkBuilder* _tmp25_;
+	GObject* _tmp26_;
+	GtkComboBoxText* _tmp27_;
+	GtkBuilder* _tmp28_;
+	GObject* _tmp29_;
+	GtkLabel* _tmp30_;
+	GtkBuilder* _tmp31_;
+	GObject* _tmp32_;
+	GtkCheckButton* _tmp33_;
+	PublishingFlickrFlickrPublisher* _tmp34_;
+	SpitPublishingAuthenticator* _tmp35_;
+	SpitPublishingAuthenticator* _tmp36_;
+	gboolean _tmp37_;
+	gboolean _tmp38_;
+	PublishingFlickrPublishingParameters* _tmp43_;
+	PublishingFlickrPublishingParameters* _tmp44_;
+	PublishingFlickrFlickrPublisher* _tmp45_;
+	PublishingFlickrFlickrPublisher* _tmp46_;
+	SpitPublishingPublisherMediaType _tmp47_;
+	gint _tmp48_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_;
+	gint _tmp50_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_;
 	gchar* upload_label_text = NULL;
-	const gchar* _tmp52_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp53_ = NULL;
-	const gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp56_ = NULL;
-	PublishingFlickrUserKind _tmp57_ = 0;
-	GtkLabel* _tmp70_ = NULL;
-	const gchar* _tmp71_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp52_;
+	const gchar* _tmp53_;
+	gchar* _tmp54_;
+	PublishingFlickrPublishingParameters* _tmp55_;
+	PublishingFlickrUserKind _tmp56_;
+	GtkLabel* _tmp67_;
+	const gchar* _tmp68_;
 	gchar* visibility_label_text = NULL;
-	const gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	SpitPublishingPublisherMediaType _tmp74_ = 0;
-	GtkLabel* _tmp80_ = NULL;
-	const gchar* _tmp81_ = NULL;
-	GtkComboBoxText* _tmp82_ = NULL;
-	SpitPublishingPublisherMediaType _tmp83_ = 0;
-	GtkCheckButton* _tmp87_ = NULL;
-	gboolean _tmp88_ = FALSE;
-	GtkButton* _tmp89_ = NULL;
-	GtkButton* _tmp90_ = NULL;
+	gchar* _tmp69_;
+	SpitPublishingPublisherMediaType _tmp70_;
+	GtkLabel* _tmp74_;
+	const gchar* _tmp75_;
+	GtkComboBoxText* _tmp76_;
+	SpitPublishingPublisherMediaType _tmp77_;
+	GtkCheckButton* _tmp81_;
+	gboolean _tmp82_;
+	GtkButton* _tmp83_;
+	GtkButton* _tmp84_;
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL);
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5844,11 +5846,11 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 	_g_object_unref0 (_tmp36_);
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp38_) {
-#line 5829 "FlickrPublishing.c"
-		GtkButton* _tmp39_ = NULL;
-		GtkContainer* _tmp40_ = NULL;
-		GtkContainer* _tmp41_ = NULL;
-		GtkButton* _tmp42_ = NULL;
+#line 5831 "FlickrPublishing.c"
+		GtkButton* _tmp39_;
+		GtkContainer* _tmp40_;
+		GtkContainer* _tmp41_;
+		GtkButton* _tmp42_;
 #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp39_ = self->priv->logout_button;
 #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5859,7 +5861,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 		_tmp42_ = self->priv->logout_button;
 #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 5844 "FlickrPublishing.c"
+#line 5846 "FlickrPublishing.c"
 	}
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp43_ = parameters;
@@ -5902,190 +5904,174 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp52_ = _ ("You are logged into Flickr as %s.\n\n");
+	_tmp52_ = parameters;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp53_ = parameters;
+	_tmp53_ = _tmp52_->username;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp54_ = _tmp53_->username;
+	_tmp54_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp53_);
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp55_ = g_strdup_printf (_tmp52_, _tmp54_);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	upload_label_text = _tmp55_;
+	upload_label_text = _tmp54_;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp56_ = parameters;
+	_tmp55_ = parameters;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp57_ = _tmp56_->user_kind;
+	_tmp56_ = _tmp55_->user_kind;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp57_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
+	if (_tmp56_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
 #line 5902 "FlickrPublishing.c"
-		const gchar* _tmp58_ = NULL;
-		const gchar* _tmp59_ = NULL;
-		PublishingFlickrPublishingParameters* _tmp60_ = NULL;
-		gint64 _tmp61_ = 0LL;
-		gchar* _tmp62_ = NULL;
-		gchar* _tmp63_ = NULL;
-		gchar* _tmp64_ = NULL;
-		gchar* _tmp65_ = NULL;
-		gchar* _tmp66_ = NULL;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp58_ = upload_label_text;
+		const gchar* _tmp57_;
+		PublishingFlickrPublishingParameters* _tmp58_;
+		gint64 _tmp59_;
+		gchar* _tmp60_;
+		gchar* _tmp61_;
+		gchar* _tmp62_;
+		gchar* _tmp63_;
+		gchar* _tmp64_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp59_ = _ ("Your free Flickr account limits how much data you can upload per month" \
-".\n" \
-"This month you have %s remaining in your upload quota.");
+		_tmp57_ = upload_label_text;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp60_ = parameters;
+		_tmp58_ = parameters;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp61_ = _tmp60_->quota_free_bytes;
+		_tmp59_ = _tmp58_->quota_free_bytes;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp62_ = g_format_size_full ((guint64) _tmp61_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
+		_tmp60_ = g_format_size_full ((guint64) _tmp59_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp63_ = _tmp62_;
+		_tmp61_ = _tmp60_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp64_ = g_strdup_printf (_tmp59_, _tmp63_);
+		_tmp62_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \
+".\n" \
+"This month you have %s remaining in your upload quota."), _tmp61_);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp65_ = _tmp64_;
+		_tmp63_ = _tmp62_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp66_ = g_strconcat (_tmp58_, _tmp65_, NULL);
+		_tmp64_ = g_strconcat (_tmp57_, _tmp63_, NULL);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp66_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp65_);
+		upload_label_text = _tmp64_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp63_);
-#line 5938 "FlickrPublishing.c"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp61_);
+#line 5935 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp67_ = NULL;
-		const gchar* _tmp68_ = NULL;
-		gchar* _tmp69_ = NULL;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp67_ = upload_label_text;
+		const gchar* _tmp65_;
+		gchar* _tmp66_;
 #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp68_ = _ ("Your Flickr Pro account entitles you to unlimited uploads.");
+		_tmp65_ = upload_label_text;
 #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp69_ = g_strconcat (_tmp67_, _tmp68_, NULL);
+		_tmp66_ = g_strconcat (_tmp65_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL);
 #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
 #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp69_;
-#line 5953 "FlickrPublishing.c"
+		upload_label_text = _tmp66_;
+#line 5947 "FlickrPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp70_ = self->priv->upload_info_label;
+	_tmp67_ = self->priv->upload_info_label;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp71_ = upload_label_text;
+	_tmp68_ = upload_label_text;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp70_, _tmp71_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp72_ = _ ("Photos _visible to:");
+	gtk_label_set_label (_tmp67_, _tmp68_);
 #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp73_ = g_strdup (_tmp72_);
+	_tmp69_ = g_strdup (_ ("Photos _visible to:"));
 #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	visibility_label_text = _tmp73_;
+	visibility_label_text = _tmp69_;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp74_ = media_type;
+	_tmp70_ = media_type;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp74_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 5971 "FlickrPublishing.c"
-		const gchar* _tmp75_ = NULL;
-		gchar* _tmp76_ = NULL;
+	if (_tmp70_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 5963 "FlickrPublishing.c"
+		gchar* _tmp71_;
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp75_ = _ ("Videos _visible to:");
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp76_ = g_strdup (_tmp75_);
+		_tmp71_ = g_strdup (_ ("Videos _visible to:"));
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (visibility_label_text);
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		visibility_label_text = _tmp76_;
-#line 5982 "FlickrPublishing.c"
+		visibility_label_text = _tmp71_;
+#line 5971 "FlickrPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp77_ = 0;
+		SpitPublishingPublisherMediaType _tmp72_;
 #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp77_ = media_type;
+		_tmp72_ = media_type;
 #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp77_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 5989 "FlickrPublishing.c"
-			const gchar* _tmp78_ = NULL;
-			gchar* _tmp79_ = NULL;
+		if (_tmp72_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 5978 "FlickrPublishing.c"
+			gchar* _tmp73_;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp78_ = _ ("Photos and videos _visible to:");
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp79_ = g_strdup (_tmp78_);
+			_tmp73_ = g_strdup (_ ("Photos and videos _visible to:"));
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (visibility_label_text);
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			visibility_label_text = _tmp79_;
-#line 6000 "FlickrPublishing.c"
+			visibility_label_text = _tmp73_;
+#line 5986 "FlickrPublishing.c"
 		}
 	}
 #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp80_ = self->priv->visibility_label;
+	_tmp74_ = self->priv->visibility_label;
 #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp81_ = visibility_label_text;
+	_tmp75_ = visibility_label_text;
 #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp80_, _tmp81_);
+	gtk_label_set_label (_tmp74_, _tmp75_);
 #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_populate_visibility_combo (self);
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp82_ = self->priv->visibility_combo;
+	_tmp76_ = self->priv->visibility_combo;
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
 #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp83_ = media_type;
+	_tmp77_ = media_type;
 #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp83_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 6019 "FlickrPublishing.c"
-		GtkComboBoxText* _tmp84_ = NULL;
+	if (_tmp77_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 6005 "FlickrPublishing.c"
+		GtkComboBoxText* _tmp78_;
 #line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_populate_size_combo (self);
 #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp84_ = self->priv->size_combo;
+		_tmp78_ = self->priv->size_combo;
 #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 6027 "FlickrPublishing.c"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 6013 "FlickrPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp85_ = NULL;
-		GtkLabel* _tmp86_ = NULL;
+		GtkComboBoxText* _tmp79_;
+		GtkLabel* _tmp80_;
 #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp85_ = self->priv->size_combo;
+		_tmp79_ = self->priv->size_combo;
 #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp86_ = self->priv->size_label;
+		_tmp80_ = self->priv->size_label;
 #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6039 "FlickrPublishing.c"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 6025 "FlickrPublishing.c"
 	}
 #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp87_ = self->priv->strip_metadata_check;
+	_tmp81_ = self->priv->strip_metadata_check;
 #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp88_ = strip_metadata;
+	_tmp82_ = strip_metadata;
 #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp88_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp82_);
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp89_ = self->priv->logout_button;
+	_tmp83_ = self->priv->logout_button;
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp89_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp83_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp90_ = self->priv->publish_button;
+	_tmp84_ = self->priv->publish_button;
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp90_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp84_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (visibility_label_text);
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (upload_label_text);
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6061 "FlickrPublishing.c"
+#line 6047 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata);
-#line 6068 "FlickrPublishing.c"
+#line 6054 "FlickrPublishing.c"
 }
 
 
@@ -6093,30 +6079,30 @@ static void publishing_flickr_publishing_options_pane_on_logout_clicked (Publish
 #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 6077 "FlickrPublishing.c"
+	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 6063 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) {
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_visibility_specification_ref (self) : NULL;
-#line 6084 "FlickrPublishing.c"
+#line 6070 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self) {
-	PublishingFlickrPublishingParameters* _tmp0_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp5_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp6_ = NULL;
-	SpitPublishingPublisherMediaType _tmp7_ = 0;
-	GtkCheckButton* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	PublishingFlickrPublishingParameters* _tmp0_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_;
+	gint _tmp1__length1;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
+	PublishingFlickrVisibilitySpecification* _tmp5_;
+	PublishingFlickrVisibilitySpecification* _tmp6_;
+	SpitPublishingPublisherMediaType _tmp7_;
+	GtkCheckButton* _tmp14_;
+	gboolean _tmp15_;
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6143,14 +6129,14 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 	_tmp7_ = self->priv->media_type;
 #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 6126 "FlickrPublishing.c"
-		PublishingFlickrPublishingParameters* _tmp8_ = NULL;
-		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-		GtkComboBoxText* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+#line 6112 "FlickrPublishing.c"
+		PublishingFlickrPublishingParameters* _tmp8_;
+		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_;
+		gint _tmp9__length1;
+		GtkComboBoxText* _tmp10_;
+		gint _tmp11_;
+		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_;
+		gint _tmp13_;
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = self->priv->parameters;
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6167,141 +6153,136 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 		_tmp13_ = _tmp12_->size;
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_->photo_major_axis_size = _tmp13_;
-#line 6150 "FlickrPublishing.c"
+#line 6136 "FlickrPublishing.c"
 	}
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = self->priv->strip_metadata_check;
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (self, "publish", _tmp15_);
-#line 6158 "FlickrPublishing.c"
+	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp15_);
+#line 6144 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6169 "FlickrPublishing.c"
+#line 6155 "FlickrPublishing.c"
 	}
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6175 "FlickrPublishing.c"
+#line 6161 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6186 "FlickrPublishing.c"
+#line 6172 "FlickrPublishing.c"
 	}
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6192 "FlickrPublishing.c"
+#line 6178 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6203 "FlickrPublishing.c"
+#line 6189 "FlickrPublishing.c"
 	}
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6209 "FlickrPublishing.c"
+#line 6195 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6220 "FlickrPublishing.c"
+#line 6206 "FlickrPublishing.c"
 	}
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6226 "FlickrPublishing.c"
+#line 6212 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6237 "FlickrPublishing.c"
+#line 6223 "FlickrPublishing.c"
 	}
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6243 "FlickrPublishing.c"
+#line 6229 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self, int* result_length1) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** result = NULL;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _result_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp3_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp4_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp5_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	const gchar* _tmp7_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp8_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp9_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp10_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	const gchar* _tmp12_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp13_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp14_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp15_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	const gchar* _tmp17_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp18_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp19_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	const gchar* _tmp22_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp23_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp24_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp25_ = NULL;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_;
+	gint _tmp1__length1;
+	PublishingFlickrVisibilitySpecification* _tmp2_;
+	PublishingFlickrVisibilitySpecification* _tmp3_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp5_;
+	gint _tmp5__length1;
+	PublishingFlickrVisibilitySpecification* _tmp6_;
+	PublishingFlickrVisibilitySpecification* _tmp7_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp8_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp9_;
+	gint _tmp9__length1;
+	PublishingFlickrVisibilitySpecification* _tmp10_;
+	PublishingFlickrVisibilitySpecification* _tmp11_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp12_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp13_;
+	gint _tmp13__length1;
+	PublishingFlickrVisibilitySpecification* _tmp14_;
+	PublishingFlickrVisibilitySpecification* _tmp15_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp16_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp17_;
+	gint _tmp17__length1;
+	PublishingFlickrVisibilitySpecification* _tmp18_;
+	PublishingFlickrVisibilitySpecification* _tmp19_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_;
+	gint _tmp21__length1;
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6317,114 +6298,104 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _ ("Everyone");
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_visibility_specification_new (1, 1, 1);
+	_tmp2_ = publishing_flickr_visibility_specification_new (1, 1, 1);
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp2_, _tmp4_);
+	_tmp4_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Everyone"), _tmp3_);
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp5_);
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_flickr_visibility_specification_unref0 (_tmp4_);
+	_publishing_flickr_visibility_specification_unref0 (_tmp3_);
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = _result_;
+	_tmp5_ = _result_;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6__length1 = _result__length1;
+	_tmp5__length1 = _result__length1;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _ ("Friends & family only");
+	_tmp6_ = publishing_flickr_visibility_specification_new (1, 1, 0);
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = publishing_flickr_visibility_specification_new (1, 1, 0);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp7_ = _tmp6_;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp7_, _tmp9_);
+	_tmp8_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends & family only"), _tmp7_);
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_flickr_visibility_specification_unref0 (_tmp9_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = _result_;
+	_publishing_flickr_visibility_specification_unref0 (_tmp7_);
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11__length1 = _result__length1;
+	_tmp9_ = _result_;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = _ ("Family only");
+	_tmp9__length1 = _result__length1;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = publishing_flickr_visibility_specification_new (0, 1, 0);
+	_tmp10_ = publishing_flickr_visibility_specification_new (0, 1, 0);
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = _tmp13_;
+	_tmp11_ = _tmp10_;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp12_, _tmp14_);
+	_tmp12_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Family only"), _tmp11_);
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_flickr_visibility_specification_unref0 (_tmp14_);
+	_publishing_flickr_visibility_specification_unref0 (_tmp11_);
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = _result_;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16__length1 = _result__length1;
+	_tmp13_ = _result_;
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = _ ("Friends only");
+	_tmp13__length1 = _result__length1;
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = publishing_flickr_visibility_specification_new (1, 0, 0);
+	_tmp14_ = publishing_flickr_visibility_specification_new (1, 0, 0);
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = _tmp18_;
+	_tmp15_ = _tmp14_;
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp17_, _tmp19_);
+	_tmp16_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends only"), _tmp15_);
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp16_);
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_flickr_visibility_specification_unref0 (_tmp19_);
+	_publishing_flickr_visibility_specification_unref0 (_tmp15_);
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp21_ = _result_;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp21__length1 = _result__length1;
+	_tmp17_ = _result_;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = _ ("Just me");
+	_tmp17__length1 = _result__length1;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = publishing_flickr_visibility_specification_new (0, 0, 0);
+	_tmp18_ = publishing_flickr_visibility_specification_new (0, 0, 0);
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = _tmp23_;
+	_tmp19_ = _tmp18_;
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp22_, _tmp24_);
+	_tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Just me"), _tmp19_);
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp25_);
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp20_);
 #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_flickr_visibility_specification_unref0 (_tmp24_);
+	_publishing_flickr_visibility_specification_unref0 (_tmp19_);
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = _result_;
+	_tmp21_ = _result_;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26__length1 = _result__length1;
+	_tmp21__length1 = _result__length1;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*result_length1 = _tmp26__length1;
-#line 6383 "FlickrPublishing.c"
+		*result_length1 = _tmp21__length1;
+#line 6354 "FlickrPublishing.c"
 	}
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp26_;
+	result = _tmp21_;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6389 "FlickrPublishing.c"
+#line 6360 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) {
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL;
-#line 6396 "FlickrPublishing.c"
+#line 6367 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self) {
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkComboBoxText* _tmp8_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_;
+	gint _tmp0__length1;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_;
+	gint _tmp3__length1;
+	GtkComboBoxText* _tmp8_;
+	PublishingFlickrFlickrPublisher* _tmp9_;
+	gint _tmp10_;
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6433,9 +6404,9 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 	_tmp0__length1 = self->priv->visibilities_length1;
 #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 6416 "FlickrPublishing.c"
-		gint _tmp1_ = 0;
-		PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL;
+#line 6387 "FlickrPublishing.c"
+		gint _tmp1_;
+		PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_;
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_);
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6446,13 +6417,13 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 		self->priv->visibilities_length1 = _tmp1_;
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 6429 "FlickrPublishing.c"
+#line 6400 "FlickrPublishing.c"
 	}
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->visibilities;
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->visibilities_length1;
-#line 6435 "FlickrPublishing.c"
+#line 6406 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL;
 		gint v_collection_length1 = 0;
@@ -6464,18 +6435,18 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 		v_collection_length1 = _tmp3__length1;
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) {
-#line 6447 "FlickrPublishing.c"
-			PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL;
+#line 6418 "FlickrPublishing.c"
+			PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL;
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]);
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			v = _tmp4_;
-#line 6454 "FlickrPublishing.c"
+#line 6425 "FlickrPublishing.c"
 			{
-				GtkComboBoxText* _tmp5_ = NULL;
-				PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
+				GtkComboBoxText* _tmp5_;
+				PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_;
+				const gchar* _tmp7_;
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->visibility_combo;
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6486,7 +6457,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v);
-#line 6469 "FlickrPublishing.c"
+#line 6440 "FlickrPublishing.c"
 			}
 		}
 	}
@@ -6498,123 +6469,118 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_);
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 6481 "FlickrPublishing.c"
+#line 6452 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6492 "FlickrPublishing.c"
+#line 6463 "FlickrPublishing.c"
 	}
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6498 "FlickrPublishing.c"
+#line 6469 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6509 "FlickrPublishing.c"
+#line 6480 "FlickrPublishing.c"
 	}
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6515 "FlickrPublishing.c"
+#line 6486 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6526 "FlickrPublishing.c"
+#line 6497 "FlickrPublishing.c"
 	}
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6532 "FlickrPublishing.c"
+#line 6503 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6543 "FlickrPublishing.c"
+#line 6514 "FlickrPublishing.c"
 	}
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6549 "FlickrPublishing.c"
+#line 6520 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6560 "FlickrPublishing.c"
+#line 6531 "FlickrPublishing.c"
 	}
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6566 "FlickrPublishing.c"
+#line 6537 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self, int* result_length1) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry** result = NULL;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _result_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp3_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp9_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	const gchar* _tmp11_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	const gchar* _tmp14_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp15_ = NULL;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp1_;
+	gint _tmp1__length1;
+	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp2_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp5_;
+	gint _tmp5__length1;
+	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp7_;
+	gint _tmp7__length1;
+	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp8_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_;
+	gint _tmp9__length1;
+	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp11_;
+	gint _tmp11__length1;
 #line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6630,84 +6596,74 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _ ("500 × 375 pixels");
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500);
+	_tmp2_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("500 × 375 pixels"), 500);
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _result_;
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3_ = _result_;
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _ ("1024 × 768 pixels");
+	_tmp3__length1 = _result__length1;
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024);
+	_tmp4_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("1024 × 768 pixels"), 1024);
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _result_;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5_ = _result_;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = _ ("2048 × 1536 pixels");
+	_tmp5__length1 = _result__length1;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048);
+	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("2048 × 1536 pixels"), 2048);
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = _result_;
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7_ = _result_;
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = _ ("4096 × 3072 pixels");
+	_tmp7__length1 = _result__length1;
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096);
+	_tmp8_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("4096 × 3072 pixels"), 4096);
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = _result_;
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13__length1 = _result__length1;
+	_tmp9_ = _result_;
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = _ ("Original size");
+	_tmp9__length1 = _result__length1;
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp14_, PUBLISHING_FLICKR_ORIGINAL_SIZE);
+	_tmp10_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("Original size"), PUBLISHING_FLICKR_ORIGINAL_SIZE);
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = _result_;
+	_tmp11_ = _result_;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16__length1 = _result__length1;
+	_tmp11__length1 = _result__length1;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*result_length1 = _tmp16__length1;
-#line 6666 "FlickrPublishing.c"
+		*result_length1 = _tmp11__length1;
+#line 6622 "FlickrPublishing.c"
 	}
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp16_;
+	result = _tmp11_;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6672 "FlickrPublishing.c"
+#line 6628 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) {
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL;
-#line 6679 "FlickrPublishing.c"
+#line 6635 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self) {
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkComboBoxText* _tmp8_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_;
+	gint _tmp0__length1;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	GtkComboBoxText* _tmp8_;
+	PublishingFlickrFlickrPublisher* _tmp9_;
+	gint _tmp10_;
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6716,9 +6672,9 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 	_tmp0__length1 = self->priv->sizes_length1;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 6699 "FlickrPublishing.c"
-		gint _tmp1_ = 0;
-		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL;
+#line 6655 "FlickrPublishing.c"
+		gint _tmp1_;
+		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_);
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6729,13 +6685,13 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 		self->priv->sizes_length1 = _tmp1_;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 6712 "FlickrPublishing.c"
+#line 6668 "FlickrPublishing.c"
 	}
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->sizes;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->sizes_length1;
-#line 6718 "FlickrPublishing.c"
+#line 6674 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL;
 		gint e_collection_length1 = 0;
@@ -6747,18 +6703,18 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 		e_collection_length1 = _tmp3__length1;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) {
-#line 6730 "FlickrPublishing.c"
-			PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL;
+#line 6686 "FlickrPublishing.c"
+			PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_;
 			PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]);
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			e = _tmp4_;
-#line 6737 "FlickrPublishing.c"
+#line 6693 "FlickrPublishing.c"
 			{
-				GtkComboBoxText* _tmp5_ = NULL;
-				PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
+				GtkComboBoxText* _tmp5_;
+				PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_;
+				const gchar* _tmp7_;
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->size_combo;
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6769,7 +6725,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_size_entry_unref0 (e);
-#line 6752 "FlickrPublishing.c"
+#line 6708 "FlickrPublishing.c"
 			}
 		}
 	}
@@ -6781,14 +6737,14 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_);
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 6764 "FlickrPublishing.c"
+#line 6720 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self) {
-	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	PublishingFlickrFlickrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6799,14 +6755,14 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 6782 "FlickrPublishing.c"
+#line 6738 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self) {
-	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	PublishingFlickrFlickrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6817,13 +6773,13 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_);
-#line 6800 "FlickrPublishing.c"
+#line 6756 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) {
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
 #line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6831,8 +6787,8 @@ void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrP
 #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (self, "publish", _tmp1_);
-#line 6815 "FlickrPublishing.c"
+	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp1_);
+#line 6771 "FlickrPublishing.c"
 }
 
 
@@ -6840,16 +6796,16 @@ void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPu
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 6824 "FlickrPublishing.c"
+	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 6780 "FlickrPublishing.c"
 }
 
 
 static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6860,7 +6816,7 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi
 	result = _tmp1_;
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6843 "FlickrPublishing.c"
+#line 6799 "FlickrPublishing.c"
 }
 
 
@@ -6873,21 +6829,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_opti
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6856 "FlickrPublishing.c"
+#line 6812 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self);
-#line 6863 "FlickrPublishing.c"
+#line 6819 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
 #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self);
-#line 6870 "FlickrPublishing.c"
+#line 6826 "FlickrPublishing.c"
 }
 
 
@@ -6899,14 +6855,14 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_installed (Sp
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
 #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 6882 "FlickrPublishing.c"
+#line 6838 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
 #line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6917,15 +6873,15 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
 #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 6900 "FlickrPublishing.c"
+#line 6856 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6944,21 +6900,21 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish
 	self->size = _tmp2_;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6927 "FlickrPublishing.c"
+#line 6883 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) {
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 6934 "FlickrPublishing.c"
+#line 6890 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6941 "FlickrPublishing.c"
+#line 6897 "FlickrPublishing.c"
 }
 
 
@@ -6967,7 +6923,7 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_free_valu
 	if (value->data[0].v_pointer) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer);
-#line 6950 "FlickrPublishing.c"
+#line 6906 "FlickrPublishing.c"
 	}
 }
 
@@ -6977,11 +6933,11 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu
 	if (src_value->data[0].v_pointer) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (src_value->data[0].v_pointer);
-#line 6960 "FlickrPublishing.c"
+#line 6916 "FlickrPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6964 "FlickrPublishing.c"
+#line 6920 "FlickrPublishing.c"
 	}
 }
 
@@ -6989,66 +6945,66 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu
 static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6972 "FlickrPublishing.c"
+#line 6928 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6979 "FlickrPublishing.c"
-		PublishingFlickrPublishingOptionsPaneSizeEntry* object;
+#line 6935 "FlickrPublishing.c"
+		PublishingFlickrPublishingOptionsPaneSizeEntry * object;
 		object = collect_values[0].v_pointer;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6986 "FlickrPublishing.c"
+#line 6942 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6990 "FlickrPublishing.c"
+#line 6946 "FlickrPublishing.c"
 		}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object);
-#line 6994 "FlickrPublishing.c"
+#line 6950 "FlickrPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6998 "FlickrPublishing.c"
+#line 6954 "FlickrPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7002 "FlickrPublishing.c"
+#line 6958 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFlickrPublishingOptionsPaneSizeEntry** object_p;
+	PublishingFlickrPublishingOptionsPaneSizeEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7013 "FlickrPublishing.c"
+#line 6969 "FlickrPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 7019 "FlickrPublishing.c"
+#line 6975 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7023 "FlickrPublishing.c"
+#line 6979 "FlickrPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 7027 "FlickrPublishing.c"
+#line 6983 "FlickrPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7031 "FlickrPublishing.c"
+#line 6987 "FlickrPublishing.c"
 }
 
 
@@ -7062,7 +7018,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_ent
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7045 "FlickrPublishing.c"
+#line 7001 "FlickrPublishing.c"
 }
 
 
@@ -7071,12 +7027,12 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7054 "FlickrPublishing.c"
+#line 7010 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) {
-	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
+	PublishingFlickrPublishingOptionsPaneSizeEntry * old;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7091,23 +7047,23 @@ static void publishing_flickr_publishing_options_pane_value_set_size_entry (GVal
 		value->data[0].v_pointer = v_object;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 7074 "FlickrPublishing.c"
+#line 7030 "FlickrPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7078 "FlickrPublishing.c"
+#line 7034 "FlickrPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 7084 "FlickrPublishing.c"
+#line 7040 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) {
-	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
+	PublishingFlickrPublishingOptionsPaneSizeEntry * old;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7120,17 +7076,17 @@ static void publishing_flickr_publishing_options_pane_value_take_size_entry (GVa
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7103 "FlickrPublishing.c"
+#line 7059 "FlickrPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7107 "FlickrPublishing.c"
+#line 7063 "FlickrPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 7113 "FlickrPublishing.c"
+#line 7069 "FlickrPublishing.c"
 	}
 }
 
@@ -7140,18 +7096,18 @@ static void publishing_flickr_publishing_options_pane_size_entry_class_init (Pub
 	publishing_flickr_publishing_options_pane_size_entry_parent_class = g_type_class_peek_parent (klass);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize;
-#line 7123 "FlickrPublishing.c"
+#line 7079 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 7130 "FlickrPublishing.c"
+#line 7086 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj) {
+static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, PublishingFlickrPublishingOptionsPaneSizeEntry);
@@ -7159,7 +7115,7 @@ static void publishing_flickr_publishing_options_pane_size_entry_finalize (Publi
 	g_signal_handlers_destroy (self);
 #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 7142 "FlickrPublishing.c"
+#line 7098 "FlickrPublishing.c"
 }
 
 
@@ -7178,18 +7134,18 @@ static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void
 
 
 static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance) {
-	PublishingFlickrPublishingOptionsPaneSizeEntry* self;
+	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
 	self = instance;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 7167 "FlickrPublishing.c"
+#line 7123 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) {
-	PublishingFlickrPublishingOptionsPaneSizeEntry* self;
+	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
 	self = instance;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -7197,17 +7153,17 @@ static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7180 "FlickrPublishing.c"
+#line 7136 "FlickrPublishing.c"
 	}
 }
 
 
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp0_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	PublishingFlickrVisibilitySpecification* _tmp0_;
+	PublishingFlickrVisibilitySpecification* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7232,21 +7188,21 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p
 	self->title = _tmp3_;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7215 "FlickrPublishing.c"
+#line 7171 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification);
-#line 7222 "FlickrPublishing.c"
+#line 7178 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7229 "FlickrPublishing.c"
+#line 7185 "FlickrPublishing.c"
 }
 
 
@@ -7255,7 +7211,7 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_fre
 	if (value->data[0].v_pointer) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer);
-#line 7238 "FlickrPublishing.c"
+#line 7194 "FlickrPublishing.c"
 	}
 }
 
@@ -7265,11 +7221,11 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop
 	if (src_value->data[0].v_pointer) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (src_value->data[0].v_pointer);
-#line 7248 "FlickrPublishing.c"
+#line 7204 "FlickrPublishing.c"
 	} else {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7252 "FlickrPublishing.c"
+#line 7208 "FlickrPublishing.c"
 	}
 }
 
@@ -7277,66 +7233,66 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop
 static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7260 "FlickrPublishing.c"
+#line 7216 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7267 "FlickrPublishing.c"
-		PublishingFlickrPublishingOptionsPaneVisibilityEntry* object;
+#line 7223 "FlickrPublishing.c"
+		PublishingFlickrPublishingOptionsPaneVisibilityEntry * object;
 		object = collect_values[0].v_pointer;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7274 "FlickrPublishing.c"
+#line 7230 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7278 "FlickrPublishing.c"
+#line 7234 "FlickrPublishing.c"
 		}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object);
-#line 7282 "FlickrPublishing.c"
+#line 7238 "FlickrPublishing.c"
 	} else {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7286 "FlickrPublishing.c"
+#line 7242 "FlickrPublishing.c"
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7290 "FlickrPublishing.c"
+#line 7246 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** object_p;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7301 "FlickrPublishing.c"
+#line 7257 "FlickrPublishing.c"
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 7307 "FlickrPublishing.c"
+#line 7263 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7311 "FlickrPublishing.c"
+#line 7267 "FlickrPublishing.c"
 	} else {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 7315 "FlickrPublishing.c"
+#line 7271 "FlickrPublishing.c"
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7319 "FlickrPublishing.c"
+#line 7275 "FlickrPublishing.c"
 }
 
 
@@ -7350,7 +7306,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibili
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7333 "FlickrPublishing.c"
+#line 7289 "FlickrPublishing.c"
 }
 
 
@@ -7359,12 +7315,12 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_e
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7342 "FlickrPublishing.c"
+#line 7298 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) {
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7379,23 +7335,23 @@ static void publishing_flickr_publishing_options_pane_value_set_visibility_entry
 		value->data[0].v_pointer = v_object;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 7362 "FlickrPublishing.c"
+#line 7318 "FlickrPublishing.c"
 	} else {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7366 "FlickrPublishing.c"
+#line 7322 "FlickrPublishing.c"
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 7372 "FlickrPublishing.c"
+#line 7328 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) {
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7408,17 +7364,17 @@ static void publishing_flickr_publishing_options_pane_value_take_visibility_entr
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7391 "FlickrPublishing.c"
+#line 7347 "FlickrPublishing.c"
 	} else {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7395 "FlickrPublishing.c"
+#line 7351 "FlickrPublishing.c"
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 7401 "FlickrPublishing.c"
+#line 7357 "FlickrPublishing.c"
 	}
 }
 
@@ -7428,18 +7384,18 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_class_ini
 	publishing_flickr_publishing_options_pane_visibility_entry_parent_class = g_type_class_peek_parent (klass);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize;
-#line 7411 "FlickrPublishing.c"
+#line 7367 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 7418 "FlickrPublishing.c"
+#line 7374 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj) {
+static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, PublishingFlickrPublishingOptionsPaneVisibilityEntry);
@@ -7449,7 +7405,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_finalize
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
 #line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 7432 "FlickrPublishing.c"
+#line 7388 "FlickrPublishing.c"
 }
 
 
@@ -7468,18 +7424,18 @@ static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type
 
 
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance) {
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
 	self = instance;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 7457 "FlickrPublishing.c"
+#line 7413 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) {
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
 	self = instance;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -7487,7 +7443,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gp
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7470 "FlickrPublishing.c"
+#line 7426 "FlickrPublishing.c"
 	}
 }
 
@@ -7500,10 +7456,10 @@ static void publishing_flickr_publishing_options_pane_class_init (PublishingFlic
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 7486 "FlickrPublishing.c"
+	publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 7442 "FlickrPublishing.c"
 }
 
 
@@ -7511,14 +7467,14 @@ static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pan
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_widget;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_on_pane_installed;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled;
-#line 7501 "FlickrPublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled;
+#line 7457 "FlickrPublishing.c"
 }
 
 
@@ -7559,11 +7515,11 @@ static void publishing_flickr_publishing_options_pane_instance_init (PublishingF
 	self->priv->parameters = NULL;
 #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 7542 "FlickrPublishing.c"
+#line 7498 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) {
+static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) {
 	PublishingFlickrPublishingOptionsPane * self;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
@@ -7597,7 +7553,7 @@ static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->publisher);
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj);
-#line 7580 "FlickrPublishing.c"
+#line 7536 "FlickrPublishing.c"
 }
 
 
@@ -7617,12 +7573,12 @@ GType publishing_flickr_publishing_options_pane_get_type (void) {
 
 PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
 	PublishingFlickrUploader* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingFlickrPublishingParameters* _tmp2_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	PublishingFlickrSession* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingFlickrPublishingParameters* _tmp2_;
+	PublishingFlickrPublishingParameters* _tmp3_;
+	gboolean _tmp4_;
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7649,47 +7605,47 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ
 	self->priv->strip_metadata = _tmp4_;
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7632 "FlickrPublishing.c"
+#line 7588 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata);
-#line 7639 "FlickrPublishing.c"
+#line 7595 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value) {
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 7650 "FlickrPublishing.c"
+#line 7606 "FlickrPublishing.c"
 	}
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7656 "FlickrPublishing.c"
+#line 7612 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable) {
-	SpitPublishingPublishable* _tmp0_ = NULL;
-	SpitPublishingPublisherMediaType _tmp1_ = 0;
+	SpitPublishingPublishable* _tmp0_;
+	SpitPublishingPublisherMediaType _tmp1_;
 	GExiv2Metadata* publishable_metadata = NULL;
-	GExiv2Metadata* _tmp2_ = NULL;
-	GExiv2Metadata* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	GExiv2Metadata* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	GExiv2Metadata* _tmp24_ = NULL;
-	gboolean _tmp25_ = FALSE;
-	GExiv2Metadata* _tmp32_ = NULL;
-	gboolean _tmp33_ = FALSE;
+	GExiv2Metadata* _tmp2_;
+	GExiv2Metadata* _tmp14_;
+	gboolean _tmp15_;
+	GExiv2Metadata* _tmp16_;
+	gboolean _tmp17_;
+	GExiv2Metadata* _tmp24_;
+	gboolean _tmp25_;
+	GExiv2Metadata* _tmp32_;
+	gboolean _tmp33_;
 	GError * _inner_error_ = NULL;
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self));
@@ -7703,20 +7659,20 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7686 "FlickrPublishing.c"
+#line 7642 "FlickrPublishing.c"
 	}
 #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gexiv2_metadata_new ();
 #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishable_metadata = _tmp2_;
-#line 7692 "FlickrPublishing.c"
+#line 7648 "FlickrPublishing.c"
 	{
-		GExiv2Metadata* _tmp3_ = NULL;
-		SpitPublishingPublishable* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		GExiv2Metadata* _tmp3_;
+		SpitPublishingPublishable* _tmp4_;
+		GFile* _tmp5_;
+		GFile* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = publishable_metadata;
 #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7737,7 +7693,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_g_object_unref0 (_tmp6_);
 #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7720 "FlickrPublishing.c"
+#line 7676 "FlickrPublishing.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -7745,11 +7701,11 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	__catch18_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPublishable* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+		SpitPublishingPublishable* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7773,7 +7729,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_g_object_unref0 (_tmp11_);
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 7755 "FlickrPublishing.c"
+#line 7711 "FlickrPublishing.c"
 	}
 	__finally18:
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7786,7 +7742,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		g_clear_error (&_inner_error_);
 #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7768 "FlickrPublishing.c"
+#line 7724 "FlickrPublishing.c"
 	}
 #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishable_metadata;
@@ -7798,7 +7754,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_g_object_unref0 (publishable_metadata);
 #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7780 "FlickrPublishing.c"
+#line 7736 "FlickrPublishing.c"
 	}
 #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = publishable_metadata;
@@ -7806,13 +7762,13 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	_tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption");
 #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp17_) {
-#line 7788 "FlickrPublishing.c"
-		GExiv2Metadata* _tmp18_ = NULL;
-		GExiv2Metadata* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
+#line 7744 "FlickrPublishing.c"
+		GExiv2Metadata* _tmp18_;
+		GExiv2Metadata* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
 #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp18_ = publishable_metadata;
 #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7831,7 +7787,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_g_free0 (_tmp23_);
 #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp21_);
-#line 7813 "FlickrPublishing.c"
+#line 7769 "FlickrPublishing.c"
 	}
 #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = publishable_metadata;
@@ -7839,13 +7795,13 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	_tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline");
 #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp25_) {
-#line 7821 "FlickrPublishing.c"
-		GExiv2Metadata* _tmp26_ = NULL;
-		GExiv2Metadata* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
+#line 7777 "FlickrPublishing.c"
+		GExiv2Metadata* _tmp26_;
+		GExiv2Metadata* _tmp27_;
+		gchar* _tmp28_;
+		gchar* _tmp29_;
+		gchar* _tmp30_;
+		gchar* _tmp31_;
 #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = publishable_metadata;
 #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7864,7 +7820,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_g_free0 (_tmp31_);
 #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp29_);
-#line 7846 "FlickrPublishing.c"
+#line 7802 "FlickrPublishing.c"
 	}
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = publishable_metadata;
@@ -7872,46 +7828,46 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	_tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords");
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp33_) {
-#line 7854 "FlickrPublishing.c"
+#line 7810 "FlickrPublishing.c"
 		GeeSet* keyword_set = NULL;
-		GeeHashSet* _tmp34_ = NULL;
+		GeeHashSet* _tmp34_;
 		gchar** iptc_keywords = NULL;
-		GExiv2Metadata* _tmp35_ = NULL;
-		gchar** _tmp36_ = NULL;
-		gchar** _tmp37_ = NULL;
-		gint iptc_keywords_length1 = 0;
-		gint _iptc_keywords_size_ = 0;
-		gchar** _tmp38_ = NULL;
-		gint _tmp38__length1 = 0;
+		GExiv2Metadata* _tmp35_;
+		gchar** _tmp36_;
+		gchar** _tmp37_;
+		gint iptc_keywords_length1;
+		gint _iptc_keywords_size_;
+		gchar** _tmp38_;
+		gint _tmp38__length1;
 		gchar** xmp_keywords = NULL;
-		GExiv2Metadata* _tmp43_ = NULL;
-		gchar** _tmp44_ = NULL;
-		gchar** _tmp45_ = NULL;
-		gint xmp_keywords_length1 = 0;
-		gint _xmp_keywords_size_ = 0;
-		gchar** _tmp46_ = NULL;
-		gint _tmp46__length1 = 0;
+		GExiv2Metadata* _tmp43_;
+		gchar** _tmp44_;
+		gchar** _tmp45_;
+		gint xmp_keywords_length1;
+		gint _xmp_keywords_size_;
+		gchar** _tmp46_;
+		gint _tmp46__length1;
 		gchar** all_keywords = NULL;
-		GeeSet* _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		gpointer* _tmp53_ = NULL;
-		gint all_keywords_length1 = 0;
-		gint _all_keywords_size_ = 0;
-		gchar** _tmp54_ = NULL;
-		gint _tmp54__length1 = 0;
+		GeeSet* _tmp51_;
+		gint _tmp52_;
+		gpointer* _tmp53_;
+		gint all_keywords_length1;
+		gint _all_keywords_size_;
+		gchar** _tmp54_;
+		gint _tmp54__length1;
 		gchar** no_keywords = NULL;
-		gchar** _tmp55_ = NULL;
-		gint no_keywords_length1 = 0;
-		gint _no_keywords_size_ = 0;
-		gchar** _tmp56_ = NULL;
-		gint _tmp56__length1 = 0;
-		gchar* _tmp57_ = NULL;
-		GExiv2Metadata* _tmp58_ = NULL;
-		gchar** _tmp59_ = NULL;
-		gint _tmp59__length1 = 0;
-		GExiv2Metadata* _tmp60_ = NULL;
-		gchar** _tmp61_ = NULL;
-		gint _tmp61__length1 = 0;
+		gchar** _tmp55_;
+		gint no_keywords_length1;
+		gint _no_keywords_size_;
+		gchar** _tmp56_;
+		gint _tmp56__length1;
+		gchar* _tmp57_;
+		GExiv2Metadata* _tmp58_;
+		gchar** _tmp59_;
+		gint _tmp59__length1;
+		GExiv2Metadata* _tmp60_;
+		gchar** _tmp61_;
+		gint _tmp61__length1;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7932,14 +7888,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_tmp38__length1 = iptc_keywords_length1;
 #line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp38_ != NULL) {
-#line 7914 "FlickrPublishing.c"
-			gchar** _tmp39_ = NULL;
-			gint _tmp39__length1 = 0;
+#line 7870 "FlickrPublishing.c"
+			gchar** _tmp39_;
+			gint _tmp39__length1;
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39_ = iptc_keywords;
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39__length1 = iptc_keywords_length1;
-#line 7921 "FlickrPublishing.c"
+#line 7877 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
@@ -7951,17 +7907,17 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 				keyword_collection_length1 = _tmp39__length1;
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
-#line 7933 "FlickrPublishing.c"
-					gchar* _tmp40_ = NULL;
+#line 7889 "FlickrPublishing.c"
+					gchar* _tmp40_;
 					gchar* keyword = NULL;
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp40_ = g_strdup (keyword_collection[keyword_it]);
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp40_;
-#line 7940 "FlickrPublishing.c"
+#line 7896 "FlickrPublishing.c"
 					{
-						GeeSet* _tmp41_ = NULL;
-						const gchar* _tmp42_ = NULL;
+						GeeSet* _tmp41_;
+						const gchar* _tmp42_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp41_ = keyword_set;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -7970,7 +7926,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 7952 "FlickrPublishing.c"
+#line 7908 "FlickrPublishing.c"
 					}
 				}
 			}
@@ -7991,14 +7947,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_tmp46__length1 = xmp_keywords_length1;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp46_ != NULL) {
-#line 7973 "FlickrPublishing.c"
-			gchar** _tmp47_ = NULL;
-			gint _tmp47__length1 = 0;
+#line 7929 "FlickrPublishing.c"
+			gchar** _tmp47_;
+			gint _tmp47__length1;
 #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47_ = xmp_keywords;
 #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47__length1 = xmp_keywords_length1;
-#line 7980 "FlickrPublishing.c"
+#line 7936 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
@@ -8010,17 +7966,17 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 				keyword_collection_length1 = _tmp47__length1;
 #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) {
-#line 7992 "FlickrPublishing.c"
-					gchar* _tmp48_ = NULL;
+#line 7948 "FlickrPublishing.c"
+					gchar* _tmp48_;
 					gchar* keyword = NULL;
 #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp48_ = g_strdup (keyword_collection[keyword_it]);
 #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp48_;
-#line 7999 "FlickrPublishing.c"
+#line 7955 "FlickrPublishing.c"
 					{
-						GeeSet* _tmp49_ = NULL;
-						const gchar* _tmp50_ = NULL;
+						GeeSet* _tmp49_;
+						const gchar* _tmp50_;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp49_ = keyword_set;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8029,7 +7985,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
 #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 8011 "FlickrPublishing.c"
+#line 7967 "FlickrPublishing.c"
 					}
 				}
 			}
@@ -8084,14 +8040,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		_tmp61__length1 = no_keywords_length1;
 #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_);
-#line 8066 "FlickrPublishing.c"
+#line 8022 "FlickrPublishing.c"
 		{
-			GExiv2Metadata* _tmp62_ = NULL;
-			SpitPublishingPublishable* _tmp63_ = NULL;
-			GFile* _tmp64_ = NULL;
-			GFile* _tmp65_ = NULL;
-			gchar* _tmp66_ = NULL;
-			gchar* _tmp67_ = NULL;
+			GExiv2Metadata* _tmp62_;
+			SpitPublishingPublishable* _tmp63_;
+			GFile* _tmp64_;
+			GFile* _tmp65_;
+			gchar* _tmp66_;
+			gchar* _tmp67_;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp62_ = publishable_metadata;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8112,7 +8068,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			_g_object_unref0 (_tmp65_);
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8094 "FlickrPublishing.c"
+#line 8050 "FlickrPublishing.c"
 				goto __catch19_g_error;
 			}
 		}
@@ -8120,11 +8076,11 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		__catch19_g_error:
 		{
 			GError* err = NULL;
-			SpitPublishingPublishable* _tmp68_ = NULL;
-			GFile* _tmp69_ = NULL;
-			GFile* _tmp70_ = NULL;
-			gchar* _tmp71_ = NULL;
-			gchar* _tmp72_ = NULL;
+			SpitPublishingPublishable* _tmp68_;
+			GFile* _tmp69_;
+			GFile* _tmp70_;
+			gchar* _tmp71_;
+			gchar* _tmp72_;
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			err = _inner_error_;
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8148,7 +8104,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			_g_object_unref0 (_tmp70_);
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 8129 "FlickrPublishing.c"
+#line 8085 "FlickrPublishing.c"
 		}
 		__finally19:
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8171,7 +8127,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			g_clear_error (&_inner_error_);
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 8152 "FlickrPublishing.c"
+#line 8108 "FlickrPublishing.c"
 		}
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
@@ -8183,26 +8139,26 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (keyword_set);
-#line 8164 "FlickrPublishing.c"
+#line 8120 "FlickrPublishing.c"
 	}
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (publishable_metadata);
-#line 8168 "FlickrPublishing.c"
+#line 8124 "FlickrPublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingFlickrUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	SpitPublishingPublishable* _tmp0_ = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	PublishingRESTSupportSession* _tmp2_ = NULL;
-	PublishingFlickrSession* _tmp3_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp4_ = NULL;
-	SpitPublishingPublishable* _tmp5_ = NULL;
-	SpitPublishingPublishable* _tmp6_ = NULL;
-	PublishingFlickrUploadTransaction* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
+	SpitPublishingPublishable* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	PublishingRESTSupportSession* _tmp2_;
+	PublishingFlickrSession* _tmp3_;
+	PublishingFlickrPublishingParameters* _tmp4_;
+	SpitPublishingPublishable* _tmp5_;
+	SpitPublishingPublishable* _tmp6_;
+	PublishingFlickrUploadTransaction* _tmp7_;
+	PublishingRESTSupportTransaction* _tmp8_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8237,7 +8193,7 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_
 	result = _tmp8_;
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8218 "FlickrPublishing.c"
+#line 8174 "FlickrPublishing.c"
 }
 
 
@@ -8249,19 +8205,19 @@ static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate));
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction;
-#line 8231 "FlickrPublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction;
+#line 8187 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) {
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self);
-#line 8238 "FlickrPublishing.c"
+#line 8194 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingFlickrUploader * self;
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
@@ -8269,7 +8225,7 @@ static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploa
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj);
-#line 8250 "FlickrPublishing.c"
+#line 8206 "FlickrPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index e066a1f..286f53b 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -1,4 +1,4 @@
-/* PicasaPublishing.c generated by valac 0.34.7, the Vala compiler
+/* PicasaPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from PicasaPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -136,6 +136,12 @@ typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionClass Publis
 typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate;
 #define _publishing_picasa_publishing_options_pane_size_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_picasa_publishing_options_pane_size_description_unref (var), NULL)))
 typedef struct _PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription;
+enum  {
+	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingPicasaPublishingParametersPrivate PublishingPicasaPublishingParametersPrivate;
 #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 typedef struct _PublishingPicasaParamSpecPublishingParameters PublishingPicasaParamSpecPublishingParameters;
@@ -307,15 +313,15 @@ static gint picasa_service_icon_pixbuf_set_length1;
 static GdkPixbuf** picasa_service_icon_pixbuf_set = NULL;
 static gint picasa_service_icon_pixbuf_set_length1 = 0;
 static gint _picasa_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* picasa_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* picasa_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * picasa_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * picasa_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_picasa_picasa_publisher_parent_class = NULL;
 static gpointer publishing_picasa_album_parent_class = NULL;
 static gpointer publishing_picasa_album_directory_transaction_parent_class = NULL;
 static gpointer publishing_picasa_upload_transaction_parent_class = NULL;
 static gpointer publishing_picasa_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_picasa_publishing_options_pane_size_description_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_picasa_publishing_parameters_parent_class = NULL;
 static gpointer publishing_picasa_uploader_parent_class = NULL;
 
@@ -337,7 +343,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 GType publishing_picasa_picasa_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media (SpitPublishingService* base);
 static void picasa_service_real_activation (SpitPluggable* base, gboolean enabled);
-static void picasa_service_finalize (GObject* obj);
+static void picasa_service_finalize (GObject * obj);
 #define PUBLISHING_PICASA_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
 gpointer publishing_picasa_publishing_parameters_ref (gpointer instance);
 void publishing_picasa_publishing_parameters_unref (gpointer instance);
@@ -366,8 +372,8 @@ GType publishing_picasa_album_get_type (void) G_GNUC_CONST;
 static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error);
 PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url);
 PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url);
-static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value);
-static void _vala_array_add13 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value);
+static void _vala_array_add12 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value);
+static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value);
 void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id);
 void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata);
 void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name);
@@ -414,11 +420,11 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
 static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base);
 static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base);
 static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
-static void publishing_picasa_picasa_publisher_finalize (GObject* obj);
+static void publishing_picasa_picasa_publisher_finalize (GObject * obj);
 enum  {
 	PUBLISHING_PICASA_ALBUM_DUMMY_PROPERTY
 };
-static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj);
+static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj);
 enum  {
 	PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_DUMMY_PROPERTY
 };
@@ -439,7 +445,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
 static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 static void _vala_SoupMultipart_free (SoupMultipart* self);
-static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
+static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
 static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance);
 static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance);
 static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -465,12 +471,12 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url);
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels);
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels);
-static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 #define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1
-static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self);
 static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
@@ -479,8 +485,8 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (
 enum  {
 	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_DUMMY_PROPERTY
 };
-static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription* obj);
-static void publishing_picasa_publishing_options_pane_finalize (GObject* obj);
+static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj);
+static void publishing_picasa_publishing_options_pane_finalize (GObject * obj);
 #define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParametersPrivate))
 enum  {
 	PUBLISHING_PICASA_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
@@ -488,13 +494,13 @@ enum  {
 gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self);
 static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length);
 static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length);
-static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj);
+static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj);
 #define PUBLISHING_PICASA_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploaderPrivate))
 enum  {
 	PUBLISHING_PICASA_UPLOADER_DUMMY_PROPERTY
 };
 static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -502,8 +508,8 @@ static gint _vala_array_length (gpointer array);
 
 PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory) {
 	PicasaService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -514,9 +520,9 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = picasa_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 513 "PicasaPublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 519 "PicasaPublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" PICASA_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -527,27 +533,27 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 		picasa_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1;
-#line 526 "PicasaPublishing.c"
+#line 532 "PicasaPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 530 "PicasaPublishing.c"
+#line 536 "PicasaPublishing.c"
 }
 
 
 PicasaService* picasa_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory);
-#line 537 "PicasaPublishing.c"
+#line 543 "PicasaPublishing.c"
 }
 
 
 static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	PicasaService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -560,7 +566,7 @@ static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 559 "PicasaPublishing.c"
+#line 565 "PicasaPublishing.c"
 }
 
 
@@ -573,7 +579,7 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.picasa";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 572 "PicasaPublishing.c"
+#line 578 "PicasaPublishing.c"
 }
 
 
@@ -586,14 +592,14 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Picasa Web Albums";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 585 "PicasaPublishing.c"
+#line 591 "PicasaPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 592 "PicasaPublishing.c"
+#line 598 "PicasaPublishing.c"
 }
 
 
@@ -604,34 +610,33 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 603 "PicasaPublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 609 "PicasaPublishing.c"
+		GdkPixbuf* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 609 "PicasaPublishing.c"
+#line 615 "PicasaPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 613 "PicasaPublishing.c"
+#line 619 "PicasaPublishing.c"
 }
 
 
 static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	PicasaService * 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 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -643,68 +648,66 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*info).authors = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc.");
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 ((*info).translators);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 ((*info).version);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 ((*info).license);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = picasa_service_icon_pixbuf_set;
+	_tmp7_ = picasa_service_icon_pixbuf_set;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8__length1 = picasa_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = picasa_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup4 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup4 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 695 "PicasaPublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 698 "PicasaPublishing.c"
 }
 
 
 static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	PicasaService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingPicasaPicasaPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingPicasaPicasaPublisher* _tmp1_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -717,7 +720,7 @@ static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 716 "PicasaPublishing.c"
+#line 719 "PicasaPublishing.c"
 }
 
 
@@ -730,7 +733,7 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 729 "PicasaPublishing.c"
+#line 732 "PicasaPublishing.c"
 }
 
 
@@ -738,7 +741,7 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable
 	PicasaService * self;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
-#line 737 "PicasaPublishing.c"
+#line 740 "PicasaPublishing.c"
 }
 
 
@@ -747,7 +750,7 @@ static void picasa_service_class_init (PicasaServiceClass * klass) {
 	picasa_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize;
-#line 746 "PicasaPublishing.c"
+#line 749 "PicasaPublishing.c"
 }
 
 
@@ -755,16 +758,16 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	picasa_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) picasa_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) picasa_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) picasa_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) picasa_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) picasa_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) picasa_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) picasa_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) picasa_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) picasa_service_real_activation;
-#line 763 "PicasaPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) picasa_service_real_activation;
+#line 766 "PicasaPublishing.c"
 }
 
 
@@ -772,10 +775,10 @@ static void picasa_service_spit_publishing_service_interface_init (SpitPublishin
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	picasa_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) picasa_service_real_create_publisher;
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) picasa_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) picasa_service_real_get_supported_media;
-#line 774 "PicasaPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) picasa_service_real_get_supported_media;
+#line 777 "PicasaPublishing.c"
 }
 
 
@@ -783,13 +786,13 @@ static void picasa_service_instance_init (PicasaService * self) {
 }
 
 
-static void picasa_service_finalize (GObject* obj) {
+static void picasa_service_finalize (GObject * obj) {
 	PicasaService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj);
-#line 788 "PicasaPublishing.c"
+#line 791 "PicasaPublishing.c"
 }
 
 
@@ -811,16 +814,16 @@ GType picasa_service_get_type (void) {
 
 PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingPicasaPicasaPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp3_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingPicasaPublishingParameters* _tmp2_;
+	PublishingPicasaPublishingParameters* _tmp3_;
 	SpitPublishingPublisherMediaType media_type = 0;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	SpitPublishingPublishable** _tmp6_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp11_ = NULL;
-	SpitPublishingPublisherMediaType _tmp12_ = 0;
+	SpitPublishingPluginHost* _tmp4_;
+	gint _tmp5_;
+	SpitPublishingPublishable** _tmp6_;
+	PublishingPicasaPublishingParameters* _tmp11_;
+	SpitPublishingPublisherMediaType _tmp12_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -847,7 +850,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 	_tmp4_ = host;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_);
-#line 846 "PicasaPublishing.c"
+#line 849 "PicasaPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -859,18 +862,18 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 		p_collection_length1 = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) {
-#line 858 "PicasaPublishing.c"
-			SpitPublishingPublishable* _tmp7_ = NULL;
+#line 861 "PicasaPublishing.c"
+			SpitPublishingPublishable* _tmp7_;
 			SpitPublishingPublishable* p = NULL;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = _g_object_ref0 (p_collection[p_it]);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			p = _tmp7_;
-#line 865 "PicasaPublishing.c"
+#line 868 "PicasaPublishing.c"
 			{
-				SpitPublishingPublisherMediaType _tmp8_ = 0;
-				SpitPublishingPublishable* _tmp9_ = NULL;
-				SpitPublishingPublisherMediaType _tmp10_ = 0;
+				SpitPublishingPublisherMediaType _tmp8_;
+				SpitPublishingPublishable* _tmp9_;
+				SpitPublishingPublisherMediaType _tmp10_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp8_ = media_type;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -881,12 +884,12 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 				media_type = _tmp8_ | _tmp10_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_g_object_unref0 (p);
-#line 880 "PicasaPublishing.c"
+#line 883 "PicasaPublishing.c"
 			}
 		}
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 885 "PicasaPublishing.c"
+#line 888 "PicasaPublishing.c"
 	}
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = self->priv->publishing_parameters;
@@ -910,66 +913,65 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 909 "PicasaPublishing.c"
+#line 912 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host);
-#line 916 "PicasaPublishing.c"
+#line 919 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) {
+static void _vala_array_add12 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 927 "PicasaPublishing.c"
+#line 930 "PicasaPublishing.c"
 	}
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 933 "PicasaPublishing.c"
+#line 936 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add13 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) {
+static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 944 "PicasaPublishing.c"
+#line 947 "PicasaPublishing.c"
 	}
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 950 "PicasaPublishing.c"
+#line 953 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error) {
 	PublishingPicasaAlbum** result = NULL;
 	PublishingPicasaAlbum** _result_ = NULL;
-	PublishingPicasaAlbum** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
+	PublishingPicasaAlbum** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
 	xmlNode* doc_node_iter = NULL;
-	xmlNode* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingPicasaAlbum** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	const gchar* _tmp10_ = NULL;
-	PublishingPicasaAlbum* _tmp11_ = NULL;
-	PublishingPicasaAlbum** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
+	xmlNode* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingPicasaAlbum** _tmp9_;
+	gint _tmp9__length1;
+	PublishingPicasaAlbum* _tmp10_;
+	PublishingPicasaAlbum** _tmp39_;
+	gint _tmp39__length1;
 	GError * _inner_error_ = NULL;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self), NULL);
@@ -989,34 +991,34 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 	_tmp2_ = _tmp1_->name;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 988 "PicasaPublishing.c"
-		xmlNode* _tmp3_ = NULL;
-		xmlNode* _tmp4_ = NULL;
+#line 990 "PicasaPublishing.c"
+		xmlNode* _tmp3_;
+		xmlNode* _tmp4_;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = document_root;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = _tmp3_->children;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		doc_node_iter = _tmp4_;
-#line 997 "PicasaPublishing.c"
+#line 999 "PicasaPublishing.c"
 	} else {
-		xmlNode* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		xmlNode* _tmp5_;
+		const gchar* _tmp6_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = document_root;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp5_->name;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1007 "PicasaPublishing.c"
-			xmlNode* _tmp7_ = NULL;
+#line 1009 "PicasaPublishing.c"
+			xmlNode* _tmp7_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = document_root;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			doc_node_iter = _tmp7_;
-#line 1013 "PicasaPublishing.c"
+#line 1015 "PicasaPublishing.c"
 		} else {
-			GError* _tmp8_ = NULL;
+			GError* _tmp8_;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node " "isn't a <feed> or <entry>");
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1029,7 +1031,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1028 "PicasaPublishing.c"
+#line 1030 "PicasaPublishing.c"
 			} else {
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
@@ -1039,7 +1041,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 				g_clear_error (&_inner_error_);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1038 "PicasaPublishing.c"
+#line 1040 "PicasaPublishing.c"
 			}
 		}
 	}
@@ -1048,62 +1050,60 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9__length1 = _result__length1;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = _ ("Default album");
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = publishing_picasa_album_new (_tmp10_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL);
+	_tmp10_ = publishing_picasa_album_new (_ ("Default album"), PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp11_);
+	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1052 "PicasaPublishing.c"
 	{
-		gboolean _tmp12_ = FALSE;
+		gboolean _tmp11_ = FALSE;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = TRUE;
+		_tmp11_ = TRUE;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		while (TRUE) {
 #line 1059 "PicasaPublishing.c"
-			xmlNode* _tmp15_ = NULL;
-			xmlNode* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
+			xmlNode* _tmp14_;
+			xmlNode* _tmp15_;
+			const gchar* _tmp16_;
 			gchar* name_val = NULL;
 			gchar* url_val = NULL;
 			xmlNode* album_node_iter = NULL;
-			xmlNode* _tmp18_ = NULL;
-			xmlNode* _tmp19_ = NULL;
-			const gchar* _tmp35_ = NULL;
-			PublishingPicasaAlbum** _tmp36_ = NULL;
-			gint _tmp36__length1 = 0;
-			const gchar* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
-			PublishingPicasaAlbum* _tmp39_ = NULL;
+			xmlNode* _tmp17_;
+			xmlNode* _tmp18_;
+			const gchar* _tmp34_;
+			PublishingPicasaAlbum** _tmp35_;
+			gint _tmp35__length1;
+			const gchar* _tmp36_;
+			const gchar* _tmp37_;
+			PublishingPicasaAlbum* _tmp38_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!_tmp12_) {
+			if (!_tmp11_) {
 #line 1076 "PicasaPublishing.c"
-				xmlNode* _tmp13_ = NULL;
-				xmlNode* _tmp14_ = NULL;
+				xmlNode* _tmp12_;
+				xmlNode* _tmp13_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp13_ = doc_node_iter;
+				_tmp12_ = doc_node_iter;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp14_ = _tmp13_->next;
+				_tmp13_ = _tmp12_->next;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				doc_node_iter = _tmp14_;
+				doc_node_iter = _tmp13_;
 #line 1085 "PicasaPublishing.c"
 			}
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp12_ = FALSE;
+			_tmp11_ = FALSE;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp15_ = doc_node_iter;
+			_tmp14_ = doc_node_iter;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!(_tmp15_ != NULL)) {
+			if (!(_tmp14_ != NULL)) {
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				break;
 #line 1095 "PicasaPublishing.c"
 			}
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp16_ = doc_node_iter;
+			_tmp15_ = doc_node_iter;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp17_ = _tmp16_->name;
+			_tmp16_ = _tmp15_->name;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (g_strcmp0 (_tmp17_, "entry") != 0) {
+			if (g_strcmp0 (_tmp16_, "entry") != 0) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				continue;
 #line 1105 "PicasaPublishing.c"
@@ -1113,107 +1113,107 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			url_val = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp18_ = doc_node_iter;
+			_tmp17_ = doc_node_iter;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp19_ = _tmp18_->children;
+			_tmp18_ = _tmp17_->children;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			album_node_iter = _tmp19_;
+			album_node_iter = _tmp18_;
 #line 1117 "PicasaPublishing.c"
 			{
-				gboolean _tmp20_ = FALSE;
+				gboolean _tmp19_ = FALSE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp20_ = TRUE;
+				_tmp19_ = TRUE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
 #line 1124 "PicasaPublishing.c"
-					xmlNode* _tmp23_ = NULL;
-					xmlNode* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
+					xmlNode* _tmp22_;
+					xmlNode* _tmp23_;
+					const gchar* _tmp24_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!_tmp20_) {
+					if (!_tmp19_) {
 #line 1130 "PicasaPublishing.c"
-						xmlNode* _tmp21_ = NULL;
-						xmlNode* _tmp22_ = NULL;
+						xmlNode* _tmp20_;
+						xmlNode* _tmp21_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp21_ = album_node_iter;
+						_tmp20_ = album_node_iter;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp22_ = _tmp21_->next;
+						_tmp21_ = _tmp20_->next;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						album_node_iter = _tmp22_;
+						album_node_iter = _tmp21_;
 #line 1139 "PicasaPublishing.c"
 					}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp20_ = FALSE;
+					_tmp19_ = FALSE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp23_ = album_node_iter;
+					_tmp22_ = album_node_iter;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!(_tmp23_ != NULL)) {
+					if (!(_tmp22_ != NULL)) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
 #line 1149 "PicasaPublishing.c"
 					}
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp24_ = album_node_iter;
+					_tmp23_ = album_node_iter;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp25_ = _tmp24_->name;
+					_tmp24_ = _tmp23_->name;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (g_strcmp0 (_tmp25_, "title") == 0) {
+					if (g_strcmp0 (_tmp24_, "title") == 0) {
 #line 1157 "PicasaPublishing.c"
-						xmlNode* _tmp26_ = NULL;
-						gchar* _tmp27_ = NULL;
+						xmlNode* _tmp25_;
+						gchar* _tmp26_;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp26_ = album_node_iter;
+						_tmp25_ = album_node_iter;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp27_ = (gchar*) xmlNodeGetContent (_tmp26_);
+						_tmp26_ = (gchar*) xmlNodeGetContent (_tmp25_);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (name_val);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						name_val = _tmp27_;
+						name_val = _tmp26_;
 #line 1168 "PicasaPublishing.c"
 					} else {
-						xmlNode* _tmp28_ = NULL;
-						const gchar* _tmp29_ = NULL;
+						xmlNode* _tmp27_;
+						const gchar* _tmp28_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp28_ = album_node_iter;
+						_tmp27_ = album_node_iter;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp29_ = _tmp28_->name;
+						_tmp28_ = _tmp27_->name;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						if (g_strcmp0 (_tmp29_, "id") == 0) {
+						if (g_strcmp0 (_tmp28_, "id") == 0) {
 #line 1178 "PicasaPublishing.c"
-							xmlNode* _tmp30_ = NULL;
-							xmlNs* _tmp31_ = NULL;
-							const gchar* _tmp32_ = NULL;
-							xmlNode* _tmp33_ = NULL;
-							gchar* _tmp34_ = NULL;
+							xmlNode* _tmp29_;
+							xmlNs* _tmp30_;
+							const gchar* _tmp31_;
+							xmlNode* _tmp32_;
+							gchar* _tmp33_;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp30_ = album_node_iter;
+							_tmp29_ = album_node_iter;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp31_ = _tmp30_->ns;
+							_tmp30_ = _tmp29_->ns;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp32_ = _tmp31_->prefix;
+							_tmp31_ = _tmp30_->prefix;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							if (_tmp32_ != NULL) {
+							if (_tmp31_ != NULL) {
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 								continue;
 #line 1194 "PicasaPublishing.c"
 							}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp33_ = album_node_iter;
+							_tmp32_ = album_node_iter;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp34_ = (gchar*) xmlNodeGetContent (_tmp33_);
+							_tmp33_ = (gchar*) xmlNodeGetContent (_tmp32_);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_g_free0 (url_val);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							url_val = _tmp34_;
+							url_val = _tmp33_;
 #line 1204 "PicasaPublishing.c"
 						}
 					}
 				}
 			}
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp35_ = url_val;
+			_tmp34_ = url_val;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (g_strcmp0 (_tmp35_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) {
+			if (g_strcmp0 (_tmp34_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_g_free0 (url_val);
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1223,17 +1223,17 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 #line 1219 "PicasaPublishing.c"
 			}
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp36_ = _result_;
+			_tmp35_ = _result_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp36__length1 = _result__length1;
+			_tmp35__length1 = _result__length1;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp37_ = name_val;
+			_tmp36_ = name_val;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp38_ = url_val;
+			_tmp37_ = url_val;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp39_ = publishing_picasa_album_new (_tmp37_, _tmp38_);
+			_tmp38_ = publishing_picasa_album_new (_tmp36_, _tmp37_);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp39_);
+			_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp38_);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (url_val);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1242,17 +1242,17 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 		}
 	}
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp40_ = _result_;
+	_tmp39_ = _result_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp40__length1 = _result__length1;
+	_tmp39__length1 = _result__length1;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		*result_length1 = _tmp40__length1;
+		*result_length1 = _tmp39__length1;
 #line 1248 "PicasaPublishing.c"
 	}
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp40_;
+	result = _tmp39_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
 #line 1254 "PicasaPublishing.c"
@@ -1260,16 +1260,16 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 
 
 static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) {
-	PublishingPicasaPublishingParameters* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	PublishingPicasaPublishingParameters* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	PublishingPicasaPublishingParameters* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	gint _tmp2_;
+	PublishingPicasaPublishingParameters* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	gboolean _tmp5_;
+	PublishingPicasaPublishingParameters* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1307,16 +1307,16 @@ static void publishing_picasa_picasa_publisher_load_parameters_from_configuratio
 
 
 static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingPicasaPublishingParameters* _tmp1_;
+	gint _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	PublishingPicasaPublishingParameters* _tmp4_;
+	gboolean _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+	PublishingPicasaPublishingParameters* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1355,11 +1355,11 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
 
 static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
-	PublishingPicasaPublishingParameters* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
+	PublishingRESTSupportGoogleSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1401,12 +1401,12 @@ static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_pub
 
 
 static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1443,17 +1443,17 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (
 
 
 static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	gboolean _tmp8_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
+	PublishingRESTSupportTransaction* _tmp9_;
+	guint _tmp10_;
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1499,8 +1499,8 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 		_tmp8_ = TRUE;
 #line 1494 "PicasaPublishing.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp11_ = NULL;
-		guint _tmp12_ = 0U;
+		PublishingRESTSupportTransaction* _tmp11_;
+		guint _tmp12_;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp11_ = bad_txn;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1515,8 +1515,8 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 		publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 1510 "PicasaPublishing.c"
 	} else {
-		SpitPublishingPluginHost* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
+		SpitPublishingPluginHost* _tmp13_;
+		GError* _tmp14_;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1529,7 +1529,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 
 
 static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1550,8 +1550,8 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_logout (Pub
 
 
 static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	PublishingPicasaPublishingParameters* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	PublishingPicasaPublishingParameters* _tmp1_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1576,14 +1576,14 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu
 
 
 static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_ = FALSE;
-	gdouble _tmp1_ = 0.0;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gboolean _tmp0_;
+	gdouble _tmp1_;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1634,12 +1634,12 @@ static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_
 
 
 static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	gboolean _tmp0_;
+	gint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportBatchUploader* _tmp4_;
+	guint _tmp5_;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1676,15 +1676,15 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic
 
 
 static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	gboolean _tmp0_ = FALSE;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportBatchUploader* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
+	gboolean _tmp0_;
+	GError* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportBatchUploader* _tmp3_;
+	guint _tmp4_;
+	PublishingRESTSupportBatchUploader* _tmp5_;
+	guint _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GError* _tmp8_;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1727,13 +1727,13 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa
 
 
 static void publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingPicasaAlbumDirectoryTransaction* directory_trans = NULL;
-	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp3_ = NULL;
-	PublishingPicasaAlbumDirectoryTransaction* _tmp4_ = NULL;
-	PublishingPicasaAlbumDirectoryTransaction* _tmp5_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp2_;
+	PublishingRESTSupportGoogleSession* _tmp3_;
+	PublishingPicasaAlbumDirectoryTransaction* _tmp4_;
+	PublishingPicasaAlbumDirectoryTransaction* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
@@ -1790,7 +1790,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 	__catch6_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp6_ = NULL;
+		GError* _tmp6_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1844,12 +1844,12 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 #line 1831 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-		PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp4_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp5_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp6_ = NULL;
+		PublishingPicasaAlbumDirectoryTransaction* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		PublishingRESTSupportXmlDocument* _tmp4_;
+		PublishingRESTSupportXmlDocument* _tmp5_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = transaction;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1897,8 +1897,8 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		SpitPublishingPluginHost* _tmp7_;
+		GError* _tmp8_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1932,13 +1932,13 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 	}
 	{
 		PublishingPicasaAlbum** _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		xmlNode* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		PublishingPicasaAlbum** _tmp13_ = NULL;
-		gint _tmp9__length1 = 0;
-		gint __tmp9__size_ = 0;
-		PublishingPicasaPublishingParameters* _tmp14_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		xmlNode* _tmp11_;
+		gint _tmp12_;
+		PublishingPicasaAlbum** _tmp13_;
+		gint _tmp9__length1;
+		gint __tmp9__size_;
+		PublishingPicasaPublishingParameters* _tmp14_;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp10_ = response_doc;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1980,8 +1980,8 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 	__catch8_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
+		SpitPublishingPluginHost* _tmp15_;
+		GError* _tmp16_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2037,18 +2037,18 @@ static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_pub
 
 static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self) {
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 	PublishingPicasaPublishingOptionsPane* opts_pane = NULL;
-	GtkBuilder* _tmp8_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp9_ = NULL;
-	SpitPublishingAuthenticator* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	PublishingPicasaPublishingOptionsPane* _tmp12_ = NULL;
-	PublishingPicasaPublishingOptionsPane* _tmp13_ = NULL;
-	PublishingPicasaPublishingOptionsPane* _tmp14_ = NULL;
-	SpitPublishingPluginHost* _tmp15_ = NULL;
-	PublishingPicasaPublishingOptionsPane* _tmp16_ = NULL;
-	SpitPublishingPluginHost* _tmp17_ = NULL;
+	GtkBuilder* _tmp7_;
+	PublishingPicasaPublishingParameters* _tmp8_;
+	SpitPublishingAuthenticator* _tmp9_;
+	gboolean _tmp10_;
+	PublishingPicasaPublishingOptionsPane* _tmp11_;
+	PublishingPicasaPublishingOptionsPane* _tmp12_;
+	PublishingPicasaPublishingOptionsPane* _tmp13_;
+	SpitPublishingPluginHost* _tmp14_;
+	PublishingPicasaPublishingOptionsPane* _tmp15_;
+	SpitPublishingPluginHost* _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
@@ -2060,7 +2060,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 	builder = _tmp0_;
 #line 2048 "PicasaPublishing.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
+		GtkBuilder* _tmp1_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = builder;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2075,12 +2075,11 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 	__catch9_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
+		GError* _tmp6_;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2094,23 +2093,21 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Picasa ca" \
-"n’t continue.");
+		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Picasa ca" \
+"n’t continue."));
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
+		_tmp6_ = _tmp5_;
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp7_ = _tmp6_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (_tmp7_);
+		_g_error_free0 (_tmp6_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (builder);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2099 "PicasaPublishing.c"
+#line 2096 "PicasaPublishing.c"
 	}
 	__finally9:
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2123,81 +2120,81 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		g_clear_error (&_inner_error_);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2112 "PicasaPublishing.c"
+#line 2109 "PicasaPublishing.c"
 	}
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = builder;
+	_tmp7_ = builder;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = self->priv->publishing_parameters;
+	_tmp8_ = self->priv->publishing_parameters;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = self->priv->authenticator;
+	_tmp9_ = self->priv->authenticator;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = spit_publishing_authenticator_can_logout (_tmp10_);
+	_tmp10_ = spit_publishing_authenticator_can_logout (_tmp9_);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = publishing_picasa_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp11_);
+	_tmp11_ = publishing_picasa_publishing_options_pane_new (_tmp7_, _tmp8_, _tmp10_);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	opts_pane = _tmp12_;
+	opts_pane = _tmp11_;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = opts_pane;
+	_tmp12_ = opts_pane;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = opts_pane;
+	_tmp13_ = opts_pane;
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp16_ = opts_pane;
+	_tmp15_ = opts_pane;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	_tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE);
+	spit_publishing_plugin_host_set_service_locked (_tmp16_, FALSE);
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (opts_pane);
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2148 "PicasaPublishing.c"
+#line 2145 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete);
-#line 2155 "PicasaPublishing.c"
+#line 2152 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	PublishingPicasaPublishingParameters* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	void* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	SpitPublishingProgressCallback _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingPicasaPublishingParameters* _tmp2_;
+	gint _tmp3_;
+	PublishingPicasaPublishingParameters* _tmp4_;
+	gboolean _tmp5_;
+	void* _tmp6_;
+	GDestroyNotify _tmp7_;
+	SpitPublishingProgressCallback _tmp8_;
+	gboolean _tmp9_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp10_;
+	gint _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	PublishingPicasaUploader* uploader = NULL;
-	PublishingRESTSupportGoogleSession* _tmp13_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp14_ = NULL;
-	SpitPublishingPublishable** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	PublishingPicasaPublishingParameters* _tmp16_ = NULL;
-	PublishingPicasaUploader* _tmp17_ = NULL;
-	PublishingPicasaUploader* _tmp18_ = NULL;
-	PublishingPicasaUploader* _tmp19_ = NULL;
-	PublishingPicasaUploader* _tmp20_ = NULL;
-	PublishingPicasaUploader* _tmp21_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp13_;
+	PublishingRESTSupportGoogleSession* _tmp14_;
+	SpitPublishingPublishable** _tmp15_;
+	gint _tmp15__length1;
+	PublishingPicasaPublishingParameters* _tmp16_;
+	PublishingPicasaUploader* _tmp17_;
+	PublishingPicasaUploader* _tmp18_;
+	PublishingPicasaUploader* _tmp19_;
+	PublishingPicasaUploader* _tmp20_;
+	PublishingPicasaUploader* _tmp21_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2239,7 +2236,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 	if (!_tmp9_) {
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2227 "PicasaPublishing.c"
+#line 2224 "PicasaPublishing.c"
 	}
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -2285,13 +2282,13 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2273 "PicasaPublishing.c"
+#line 2270 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2304,16 +2301,16 @@ static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingP
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2292 "PicasaPublishing.c"
+#line 2289 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	SpitPublishingAuthenticator* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
+	SpitPublishingAuthenticator* _tmp2_;
+	gboolean _tmp3_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2332,9 +2329,9 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 	_tmp3_ = spit_publishing_authenticator_can_logout (_tmp2_);
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp3_) {
-#line 2320 "PicasaPublishing.c"
-		SpitPublishingAuthenticator* _tmp4_ = NULL;
-		SpitPublishingAuthenticator* _tmp5_ = NULL;
+#line 2317 "PicasaPublishing.c"
+		SpitPublishingAuthenticator* _tmp4_;
+		SpitPublishingAuthenticator* _tmp5_;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = self->priv->authenticator;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2343,7 +2340,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 		_tmp5_ = self->priv->authenticator;
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_authenticator_authenticate (_tmp5_);
-#line 2331 "PicasaPublishing.c"
+#line 2328 "PicasaPublishing.c"
 	}
 }
 
@@ -2351,7 +2348,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2360,14 +2357,14 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
 	result = _tmp0_;
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 2348 "PicasaPublishing.c"
+#line 2345 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	SpitPublishingAuthenticator* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	SpitPublishingAuthenticator* _tmp1_;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2378,7 +2375,7 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport
 	if (_tmp0_) {
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2366 "PicasaPublishing.c"
+#line 2363 "PicasaPublishing.c"
 	}
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = TRUE;
@@ -2386,14 +2383,14 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport
 	_tmp1_ = self->priv->authenticator;
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_authenticator_authenticate (_tmp1_);
-#line 2374 "PicasaPublishing.c"
+#line 2371 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
 #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2408,27 +2405,27 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = FALSE;
-#line 2396 "PicasaPublishing.c"
+#line 2393 "PicasaPublishing.c"
 }
 
 
 static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
 	SpitPublishingAuthenticator* result = NULL;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	SpitPublishingAuthenticator* _tmp5_ = NULL;
-	SpitPublishingAuthenticator* _tmp6_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
+	SpitPublishingAuthenticator* _tmp5_;
+	SpitPublishingAuthenticator* _tmp6_;
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
 #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
 #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 2412 "PicasaPublishing.c"
-		PublishingAuthenticatorFactory* _tmp1_ = NULL;
-		PublishingAuthenticatorFactory* _tmp2_ = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 2409 "PicasaPublishing.c"
+		PublishingAuthenticatorFactory* _tmp1_;
+		PublishingAuthenticatorFactory* _tmp2_;
+		SpitPublishingPluginHost* _tmp3_;
+		SpitPublishingAuthenticator* _tmp4_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = publishing_authenticator_factory_get_instance ();
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2443,7 +2440,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
 		self->priv->authenticator = _tmp4_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2431 "PicasaPublishing.c"
+#line 2428 "PicasaPublishing.c"
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = self->priv->authenticator;
@@ -2453,7 +2450,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
 	result = _tmp6_;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 2441 "PicasaPublishing.c"
+#line 2438 "PicasaPublishing.c"
 }
 
 
@@ -2463,31 +2460,31 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPicasaPublisherPrivate));
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_on_login_flow_complete;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_on_login_flow_complete;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_do_logout;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_do_logout;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_is_running;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_is_running;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_start;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_start;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_stop;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_stop;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_get_authenticator;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_get_authenticator;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize;
-#line 2464 "PicasaPublishing.c"
+#line 2461 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) {
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self);
-#line 2471 "PicasaPublishing.c"
+#line 2468 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_finalize (GObject* obj) {
+static void publishing_picasa_picasa_publisher_finalize (GObject * obj) {
 	PublishingPicasaPicasaPublisher * self;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
@@ -2505,7 +2502,7 @@ static void publishing_picasa_picasa_publisher_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->authenticator);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj);
-#line 2493 "PicasaPublishing.c"
+#line 2490 "PicasaPublishing.c"
 }
 
 
@@ -2523,10 +2520,10 @@ GType publishing_picasa_picasa_publisher_get_type (void) {
 
 PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url) {
 	PublishingPicasaAlbum* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2551,21 +2548,21 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con
 	self->url = _tmp3_;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 2539 "PicasaPublishing.c"
+#line 2536 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) {
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url);
-#line 2546 "PicasaPublishing.c"
+#line 2543 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_album_init (GValue* value) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2553 "PicasaPublishing.c"
+#line 2550 "PicasaPublishing.c"
 }
 
 
@@ -2574,7 +2571,7 @@ static void publishing_picasa_value_album_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (value->data[0].v_pointer);
-#line 2562 "PicasaPublishing.c"
+#line 2559 "PicasaPublishing.c"
 	}
 }
 
@@ -2584,11 +2581,11 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G
 	if (src_value->data[0].v_pointer) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer);
-#line 2572 "PicasaPublishing.c"
+#line 2569 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2576 "PicasaPublishing.c"
+#line 2573 "PicasaPublishing.c"
 	}
 }
 
@@ -2596,66 +2593,66 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G
 static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2584 "PicasaPublishing.c"
+#line 2581 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2591 "PicasaPublishing.c"
-		PublishingPicasaAlbum* object;
+#line 2588 "PicasaPublishing.c"
+		PublishingPicasaAlbum * object;
 		object = collect_values[0].v_pointer;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2598 "PicasaPublishing.c"
+#line 2595 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2602 "PicasaPublishing.c"
+#line 2599 "PicasaPublishing.c"
 		}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 2606 "PicasaPublishing.c"
+#line 2603 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2610 "PicasaPublishing.c"
+#line 2607 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 2614 "PicasaPublishing.c"
+#line 2611 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingPicasaAlbum** object_p;
+	PublishingPicasaAlbum ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2625 "PicasaPublishing.c"
+#line 2622 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 2631 "PicasaPublishing.c"
+#line 2628 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2635 "PicasaPublishing.c"
+#line 2632 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 2639 "PicasaPublishing.c"
+#line 2636 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 2643 "PicasaPublishing.c"
+#line 2640 "PicasaPublishing.c"
 }
 
 
@@ -2669,7 +2666,7 @@ GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2657 "PicasaPublishing.c"
+#line 2654 "PicasaPublishing.c"
 }
 
 
@@ -2678,12 +2675,12 @@ gpointer publishing_picasa_value_get_album (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2666 "PicasaPublishing.c"
+#line 2663 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
-	PublishingPicasaAlbum* old;
+	PublishingPicasaAlbum * old;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2698,23 +2695,23 @@ void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 2686 "PicasaPublishing.c"
+#line 2683 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2690 "PicasaPublishing.c"
+#line 2687 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 2696 "PicasaPublishing.c"
+#line 2693 "PicasaPublishing.c"
 	}
 }
 
 
 void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
-	PublishingPicasaAlbum* old;
+	PublishingPicasaAlbum * old;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2727,17 +2724,17 @@ void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2715 "PicasaPublishing.c"
+#line 2712 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2719 "PicasaPublishing.c"
+#line 2716 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 2725 "PicasaPublishing.c"
+#line 2722 "PicasaPublishing.c"
 	}
 }
 
@@ -2747,18 +2744,18 @@ static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * kla
 	publishing_picasa_album_parent_class = g_type_class_peek_parent (klass);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize;
-#line 2735 "PicasaPublishing.c"
+#line 2732 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 2742 "PicasaPublishing.c"
+#line 2739 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) {
+static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj) {
 	PublishingPicasaAlbum * self;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_ALBUM, PublishingPicasaAlbum);
@@ -2768,7 +2765,7 @@ static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) {
 	_g_free0 (self->name);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
-#line 2756 "PicasaPublishing.c"
+#line 2753 "PicasaPublishing.c"
 }
 
 
@@ -2787,18 +2784,18 @@ GType publishing_picasa_album_get_type (void) {
 
 
 gpointer publishing_picasa_album_ref (gpointer instance) {
-	PublishingPicasaAlbum* self;
+	PublishingPicasaAlbum * self;
 	self = instance;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 2781 "PicasaPublishing.c"
+#line 2778 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_album_unref (gpointer instance) {
-	PublishingPicasaAlbum* self;
+	PublishingPicasaAlbum * self;
 	self = instance;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2806,14 +2803,14 @@ void publishing_picasa_album_unref (gpointer instance) {
 		PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2794 "PicasaPublishing.c"
+#line 2791 "PicasaPublishing.c"
 	}
 }
 
 
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
 	PublishingPicasaAlbumDirectoryTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2822,25 +2819,25 @@ PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_tra
 	self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 2810 "PicasaPublishing.c"
+#line 2807 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session);
-#line 2817 "PicasaPublishing.c"
+#line 2814 "PicasaPublishing.c"
 }
 
 
 gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
 	gchar* result = NULL;
 	xmlNode* document_root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp0_;
+	xmlNode* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	xmlNode* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	xmlNode* _tmp3_;
+	const gchar* _tmp4_;
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2857,17 +2854,17 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 	if (g_strcmp0 (_tmp4_, "feed") == 0) {
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = TRUE;
-#line 2845 "PicasaPublishing.c"
+#line 2842 "PicasaPublishing.c"
 	} else {
-		xmlNode* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		xmlNode* _tmp5_;
+		const gchar* _tmp6_;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = document_root;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp5_->name;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 2855 "PicasaPublishing.c"
+#line 2852 "PicasaPublishing.c"
 	}
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_) {
@@ -2875,16 +2872,16 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 		result = NULL;
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 2863 "PicasaPublishing.c"
+#line 2860 "PicasaPublishing.c"
 	} else {
-		gchar* _tmp7_ = NULL;
+		gchar* _tmp7_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>");
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result = _tmp7_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 2872 "PicasaPublishing.c"
+#line 2869 "PicasaPublishing.c"
 	}
 }
 
@@ -2892,7 +2889,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) {
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2880 "PicasaPublishing.c"
+#line 2877 "PicasaPublishing.c"
 }
 
 
@@ -2915,33 +2912,33 @@ GType publishing_picasa_album_directory_transaction_get_type (void) {
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 2903 "PicasaPublishing.c"
+#line 2900 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) {
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_parameters_ref (self) : NULL;
-#line 2910 "PicasaPublishing.c"
+#line 2907 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingPicasaUploadTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	PublishingRESTSupportGoogleSession* _tmp6_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp7_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp8_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp9_ = NULL;
-	SpitPublishingPublishable* _tmp10_ = NULL;
-	SpitPublishingPublishable* _tmp11_ = NULL;
-	SpitPublishingPublishable* _tmp12_ = NULL;
-	SpitPublishingPublisherMediaType _tmp13_ = 0;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	PublishingPicasaPublishingParameters* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRESTSupportGoogleSession* _tmp4_;
+	gboolean _tmp5_;
+	PublishingRESTSupportGoogleSession* _tmp6_;
+	PublishingRESTSupportGoogleSession* _tmp7_;
+	PublishingPicasaPublishingParameters* _tmp8_;
+	PublishingPicasaPublishingParameters* _tmp9_;
+	SpitPublishingPublishable* _tmp10_;
+	SpitPublishingPublishable* _tmp11_;
+	SpitPublishingPublishable* _tmp12_;
+	SpitPublishingPublisherMediaType _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
@@ -2997,17 +2994,17 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 	_tmp13_ = spit_publishing_publishable_get_media_type (_tmp12_);
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp13_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 2985 "PicasaPublishing.c"
+#line 2982 "PicasaPublishing.c"
 		{
 			GFileInfo* info = NULL;
-			SpitPublishingPublishable* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			GFileInfo* _tmp17_ = NULL;
-			GFileInfo* _tmp18_ = NULL;
-			GFileInfo* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
+			SpitPublishingPublishable* _tmp14_;
+			GFile* _tmp15_;
+			GFile* _tmp16_;
+			GFileInfo* _tmp17_;
+			GFileInfo* _tmp18_;
+			GFileInfo* _tmp19_;
+			const gchar* _tmp20_;
+			gchar* _tmp21_;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp14_ = self->priv->publishable;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3024,7 +3021,7 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 			info = _tmp18_;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3012 "PicasaPublishing.c"
+#line 3009 "PicasaPublishing.c"
 				goto __catch10_g_error;
 			}
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3039,13 +3036,13 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 			self->priv->mime_type = _tmp21_;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (info);
-#line 3027 "PicasaPublishing.c"
+#line 3024 "PicasaPublishing.c"
 		}
 		goto __finally10;
 		__catch10_g_error:
 		{
 			GError* err = NULL;
-			gchar* _tmp22_ = NULL;
+			gchar* _tmp22_;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			err = _inner_error_;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3058,7 +3055,7 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 			self->priv->mime_type = _tmp22_;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_error_free0 (err);
-#line 3046 "PicasaPublishing.c"
+#line 3043 "PicasaPublishing.c"
 		}
 		__finally10:
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3069,71 +3066,71 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 			g_clear_error (&_inner_error_);
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return NULL;
-#line 3057 "PicasaPublishing.c"
+#line 3054 "PicasaPublishing.c"
 		}
 	} else {
-		gchar* _tmp23_ = NULL;
+		gchar* _tmp23_;
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp23_ = g_strdup ("image/jpeg");
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (self->priv->mime_type);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		self->priv->mime_type = _tmp23_;
-#line 3067 "PicasaPublishing.c"
+#line 3064 "PicasaPublishing.c"
 	}
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3071 "PicasaPublishing.c"
+#line 3068 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3078 "PicasaPublishing.c"
+#line 3075 "PicasaPublishing.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 3101 "PicasaPublishing.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3098 "PicasaPublishing.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3109 "PicasaPublishing.c"
+#line 3106 "PicasaPublishing.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3121 "PicasaPublishing.c"
+#line 3118 "PicasaPublishing.c"
 	}
 }
 
@@ -3142,532 +3139,532 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 3145 "PicasaPublishing.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3142 "PicasaPublishing.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3151 "PicasaPublishing.c"
+#line 3148 "PicasaPublishing.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3155 "PicasaPublishing.c"
+#line 3152 "PicasaPublishing.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3159 "PicasaPublishing.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3156 "PicasaPublishing.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 3171 "PicasaPublishing.c"
+#line 3168 "PicasaPublishing.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 3181 "PicasaPublishing.c"
+#line 3178 "PicasaPublishing.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 3187 "PicasaPublishing.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3184 "PicasaPublishing.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3201 "PicasaPublishing.c"
+#line 3198 "PicasaPublishing.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3211 "PicasaPublishing.c"
+#line 3208 "PicasaPublishing.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 3217 "PicasaPublishing.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3214 "PicasaPublishing.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 3226 "PicasaPublishing.c"
+#line 3223 "PicasaPublishing.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3246 "PicasaPublishing.c"
+#line 3243 "PicasaPublishing.c"
 }
 
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
-#line 3263 "PicasaPublishing.c"
+#line 3260 "PicasaPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 3273 "PicasaPublishing.c"
+#line 3270 "PicasaPublishing.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 3283 "PicasaPublishing.c"
+#line 3280 "PicasaPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 3289 "PicasaPublishing.c"
+#line 3286 "PicasaPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 3300 "PicasaPublishing.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3297 "PicasaPublishing.c"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 3312 "PicasaPublishing.c"
+#line 3309 "PicasaPublishing.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 3316 "PicasaPublishing.c"
+#line 3313 "PicasaPublishing.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 3320 "PicasaPublishing.c"
+#line 3317 "PicasaPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 3324 "PicasaPublishing.c"
+#line 3321 "PicasaPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 3347 "PicasaPublishing.c"
+#line 3344 "PicasaPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3356 "PicasaPublishing.c"
+#line 3353 "PicasaPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 3369 "PicasaPublishing.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3366 "PicasaPublishing.c"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 3375 "PicasaPublishing.c"
+#line 3372 "PicasaPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 3385 "PicasaPublishing.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3382 "PicasaPublishing.c"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3397 "PicasaPublishing.c"
+#line 3394 "PicasaPublishing.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 3401 "PicasaPublishing.c"
+#line 3398 "PicasaPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 3407 "PicasaPublishing.c"
+#line 3404 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 3418 "PicasaPublishing.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3415 "PicasaPublishing.c"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 3433 "PicasaPublishing.c"
+#line 3430 "PicasaPublishing.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 3437 "PicasaPublishing.c"
+#line 3434 "PicasaPublishing.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 3441 "PicasaPublishing.c"
+#line 3438 "PicasaPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 3447 "PicasaPublishing.c"
+#line 3444 "PicasaPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 3459 "PicasaPublishing.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3456 "PicasaPublishing.c"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 3480 "PicasaPublishing.c"
+#line 3477 "PicasaPublishing.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 3484 "PicasaPublishing.c"
+#line 3481 "PicasaPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 3490 "PicasaPublishing.c"
+#line 3487 "PicasaPublishing.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 3497 "PicasaPublishing.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3494 "PicasaPublishing.c"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
-#line 3505 "PicasaPublishing.c"
+#line 3502 "PicasaPublishing.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 3543 "PicasaPublishing.c"
+#line 3540 "PicasaPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3552 "PicasaPublishing.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+#line 3549 "PicasaPublishing.c"
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 3568 "PicasaPublishing.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3565 "PicasaPublishing.c"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 3574 "PicasaPublishing.c"
+#line 3571 "PicasaPublishing.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 3588 "PicasaPublishing.c"
+#line 3585 "PicasaPublishing.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 3608 "PicasaPublishing.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3605 "PicasaPublishing.c"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 3623 "PicasaPublishing.c"
+#line 3620 "PicasaPublishing.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 3627 "PicasaPublishing.c"
+#line 3624 "PicasaPublishing.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 3635 "PicasaPublishing.c"
+#line 3632 "PicasaPublishing.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3646 "PicasaPublishing.c"
+#line 3643 "PicasaPublishing.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3655 "PicasaPublishing.c"
+#line 3652 "PicasaPublishing.c"
 	}
 }
 
@@ -3675,135 +3672,135 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 static guint8* string_get_data (const gchar* self, int* result_length1) {
 	guint8* result;
 	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 3700 "PicasaPublishing.c"
+#line 3697 "PicasaPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3706 "PicasaPublishing.c"
+#line 3703 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 3713 "PicasaPublishing.c"
+#line 3710 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 3720 "PicasaPublishing.c"
+#line 3717 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingPicasaUploadTransaction * self;
 	SoupMultipart* message_parts = NULL;
-	SoupMultipart* _tmp0_ = NULL;
+	SoupMultipart* _tmp0_;
 	gchar* summary = NULL;
-	gchar* _tmp1_ = NULL;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	gchar* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_;
 	gchar** keywords = NULL;
-	SpitPublishingPublishable* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gchar** _tmp14_ = NULL;
-	gint keywords_length1 = 0;
-	gint _keywords_size_ = 0;
+	SpitPublishingPublishable* _tmp12_;
+	gint _tmp13_;
+	gchar** _tmp14_;
+	gint keywords_length1;
+	gint _keywords_size_;
 	gchar* keywords_string = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	gchar* _tmp15_;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
 	gchar* metadata = NULL;
-	SpitPublishingPublishable* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	const gchar* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
+	SpitPublishingPublishable* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	const gchar* _tmp56_;
+	const gchar* _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
 	SoupBuffer* metadata_buffer = NULL;
-	const gchar* _tmp60_ = NULL;
-	guint8* _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	guint8* _tmp62_ = NULL;
-	gint _tmp62__length1 = 0;
-	SoupBuffer* _tmp63_ = NULL;
-	SoupMultipart* _tmp64_ = NULL;
-	SoupBuffer* _tmp65_ = NULL;
+	const gchar* _tmp60_;
+	guint8* _tmp61_;
+	gint _tmp61__length1;
+	guint8* _tmp62_;
+	gint _tmp62__length1;
+	SoupBuffer* _tmp63_;
+	SoupMultipart* _tmp64_;
+	SoupBuffer* _tmp65_;
 	guint8* photo_data = NULL;
-	GMappedFile* _tmp87_ = NULL;
-	gchar* _tmp88_ = NULL;
-	gint photo_data_length1 = 0;
-	gint _photo_data_size_ = 0;
-	GMappedFile* _tmp89_ = NULL;
-	gsize _tmp90_ = 0UL;
-	gint _tmp91_ = 0;
+	GMappedFile* _tmp87_;
+	gchar* _tmp88_;
+	gint photo_data_length1;
+	gint _photo_data_size_;
+	GMappedFile* _tmp89_;
+	gsize _tmp90_;
+	gint _tmp91_;
 	SoupBuffer* bindable_data = NULL;
-	SoupBuffer* _tmp92_ = NULL;
-	SoupMultipart* _tmp93_ = NULL;
-	SpitPublishingPublishable* _tmp94_ = NULL;
-	GFile* _tmp95_ = NULL;
-	GFile* _tmp96_ = NULL;
-	gchar* _tmp97_ = NULL;
-	gchar* _tmp98_ = NULL;
-	const gchar* _tmp99_ = NULL;
+	SoupBuffer* _tmp92_;
+	SoupMultipart* _tmp93_;
+	SpitPublishingPublishable* _tmp94_;
+	GFile* _tmp95_;
+	GFile* _tmp96_;
+	gchar* _tmp97_;
+	gchar* _tmp98_;
+	const gchar* _tmp99_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp100_ = NULL;
-	gchar* _tmp101_ = NULL;
-	SoupMultipart* _tmp102_ = NULL;
-	SoupMessage* _tmp103_ = NULL;
-	SoupMessage* _tmp104_ = NULL;
-	SoupMessageHeaders* _tmp105_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp106_ = NULL;
-	gchar* _tmp107_ = NULL;
-	gchar* _tmp108_ = NULL;
-	gchar* _tmp109_ = NULL;
-	gchar* _tmp110_ = NULL;
+	gchar* _tmp100_;
+	gchar* _tmp101_;
+	SoupMultipart* _tmp102_;
+	SoupMessage* _tmp103_;
+	SoupMessage* _tmp104_;
+	SoupMessageHeaders* _tmp105_;
+	PublishingRESTSupportGoogleSession* _tmp106_;
+	gchar* _tmp107_;
+	gchar* _tmp108_;
+	gchar* _tmp109_;
+	gchar* _tmp110_;
 	GError * _inner_error_ = NULL;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -3827,13 +3824,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_g_free0 (_tmp4_);
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp5_) {
-#line 3815 "PicasaPublishing.c"
-		SpitPublishingPublishable* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+#line 3812 "PicasaPublishing.c"
+		SpitPublishingPublishable* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = self->priv->publishable;
 #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3854,7 +3851,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		_g_free0 (_tmp10_);
 #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 3842 "PicasaPublishing.c"
+#line 3839 "PicasaPublishing.c"
 	}
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = self->priv->publishable;
@@ -3876,46 +3873,46 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_tmp16__length1 = keywords_length1;
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp16__length1 > 0) {
-#line 3864 "PicasaPublishing.c"
-		const gchar* _tmp47_ = NULL;
-		gchar* _tmp48_ = NULL;
-		const gchar* _tmp49_ = NULL;
-		gchar* _tmp50_ = NULL;
+#line 3861 "PicasaPublishing.c"
+		const gchar* _tmp47_;
+		gchar* _tmp48_;
+		const gchar* _tmp49_;
+		gchar* _tmp50_;
 		{
 			gint i = 0;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			i = 0;
-#line 3873 "PicasaPublishing.c"
+#line 3870 "PicasaPublishing.c"
 			{
 				gboolean _tmp17_ = FALSE;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = TRUE;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
-#line 3880 "PicasaPublishing.c"
-					gint _tmp19_ = 0;
-					gchar** _tmp20_ = NULL;
-					gint _tmp20__length1 = 0;
+#line 3877 "PicasaPublishing.c"
+					gint _tmp19_;
+					gchar** _tmp20_;
+					gint _tmp20__length1;
 					gchar** tmp = NULL;
 					gint tmp_length1 = 0;
 					gint _tmp_size_ = 0;
-					gchar** _tmp21_ = NULL;
-					gint _tmp21__length1 = 0;
-					gint _tmp22_ = 0;
-					const gchar* _tmp23_ = NULL;
-					gboolean _tmp24_ = FALSE;
-					const gchar* _tmp37_ = NULL;
-					gint _tmp38_ = 0;
-					gint _tmp39_ = 0;
+					gchar** _tmp21_;
+					gint _tmp21__length1;
+					gint _tmp22_;
+					const gchar* _tmp23_;
+					gboolean _tmp24_;
+					const gchar* _tmp37_;
+					gint _tmp38_;
+					gint _tmp39_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!_tmp17_) {
-#line 3897 "PicasaPublishing.c"
-						gint _tmp18_ = 0;
+#line 3894 "PicasaPublishing.c"
+						gint _tmp18_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp18_ = i;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						i = _tmp18_ + 1;
-#line 3903 "PicasaPublishing.c"
+#line 3900 "PicasaPublishing.c"
 					}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
@@ -3929,7 +3926,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					if (!(_tmp19_ < _tmp20__length1)) {
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
-#line 3917 "PicasaPublishing.c"
+#line 3914 "PicasaPublishing.c"
 					}
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = keywords;
@@ -3943,15 +3940,15 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					_tmp24_ = g_str_has_prefix (_tmp23_, "/");
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp24_) {
-#line 3931 "PicasaPublishing.c"
-						gchar** _tmp25_ = NULL;
-						gint _tmp25__length1 = 0;
-						gint _tmp26_ = 0;
-						const gchar* _tmp27_ = NULL;
-						gchar* _tmp28_ = NULL;
-						gchar* _tmp29_ = NULL;
-						gchar** _tmp30_ = NULL;
-						gchar** _tmp31_ = NULL;
+#line 3928 "PicasaPublishing.c"
+						gchar** _tmp25_;
+						gint _tmp25__length1;
+						gint _tmp26_;
+						const gchar* _tmp27_;
+						gchar* _tmp28_;
+						gchar* _tmp29_;
+						gchar** _tmp30_;
+						gchar** _tmp31_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp25_ = keywords;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3976,14 +3973,14 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						_tmp_size_ = tmp_length1;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp29_);
-#line 3964 "PicasaPublishing.c"
+#line 3961 "PicasaPublishing.c"
 					} else {
-						gchar** _tmp32_ = NULL;
-						gint _tmp32__length1 = 0;
-						gint _tmp33_ = 0;
-						const gchar* _tmp34_ = NULL;
-						gchar** _tmp35_ = NULL;
-						gchar** _tmp36_ = NULL;
+						gchar** _tmp32_;
+						gint _tmp32__length1;
+						gint _tmp33_;
+						const gchar* _tmp34_;
+						gchar** _tmp35_;
+						gchar** _tmp36_;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp32_ = keywords;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4002,7 +3999,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						tmp_length1 = _vala_array_length (_tmp35_);
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
-#line 3990 "PicasaPublishing.c"
+#line 3987 "PicasaPublishing.c"
 					}
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp37_ = keywords_string;
@@ -4012,13 +4009,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					_tmp39_ = _tmp38_;
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp39_ > 0) {
-#line 4000 "PicasaPublishing.c"
-						const gchar* _tmp40_ = NULL;
-						gchar** _tmp41_ = NULL;
-						gint _tmp41__length1 = 0;
-						gchar* _tmp42_ = NULL;
-						gchar* _tmp43_ = NULL;
-						gchar* _tmp44_ = NULL;
+#line 3997 "PicasaPublishing.c"
+						const gchar* _tmp40_;
+						gchar** _tmp41_;
+						gint _tmp41__length1;
+						gchar* _tmp42_;
+						gchar* _tmp43_;
+						gchar* _tmp44_;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp40_ = keywords_string;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4037,11 +4034,11 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						keywords_string = _tmp44_;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp43_);
-#line 4025 "PicasaPublishing.c"
+#line 4022 "PicasaPublishing.c"
 					} else {
-						gchar** _tmp45_ = NULL;
-						gint _tmp45__length1 = 0;
-						gchar* _tmp46_ = NULL;
+						gchar** _tmp45_;
+						gint _tmp45__length1;
+						gchar* _tmp46_;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp45_ = tmp;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4052,11 +4049,11 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						_g_free0 (keywords_string);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						keywords_string = _tmp46_;
-#line 4040 "PicasaPublishing.c"
+#line 4037 "PicasaPublishing.c"
 					}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 4044 "PicasaPublishing.c"
+#line 4041 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -4076,7 +4073,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		_g_free0 (keywords_string);
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		keywords_string = _tmp50_;
-#line 4064 "PicasaPublishing.c"
+#line 4061 "PicasaPublishing.c"
 	}
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp51_ = self->priv->publishable;
@@ -4120,17 +4117,17 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_tmp65_ = metadata_buffer;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
-#line 4108 "PicasaPublishing.c"
+#line 4105 "PicasaPublishing.c"
 	{
 		GMappedFile* _tmp66_ = NULL;
-		SpitPublishingPublishable* _tmp67_ = NULL;
-		GFile* _tmp68_ = NULL;
-		GFile* _tmp69_ = NULL;
-		gchar* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
-		GMappedFile* _tmp72_ = NULL;
-		GMappedFile* _tmp73_ = NULL;
-		GMappedFile* _tmp74_ = NULL;
+		SpitPublishingPublishable* _tmp67_;
+		GFile* _tmp68_;
+		GFile* _tmp69_;
+		gchar* _tmp70_;
+		gchar* _tmp71_;
+		GMappedFile* _tmp72_;
+		GMappedFile* _tmp73_;
+		GMappedFile* _tmp74_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp67_ = self->priv->publishable;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4155,7 +4152,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4143 "PicasaPublishing.c"
+#line 4140 "PicasaPublishing.c"
 				goto __catch11_g_file_error;
 			}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4176,7 +4173,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4164 "PicasaPublishing.c"
+#line 4161 "PicasaPublishing.c"
 		}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp74_ = _tmp66_;
@@ -4188,25 +4185,25 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		self->priv->mapped_file = _tmp74_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_mapped_file_unref0 (_tmp66_);
-#line 4176 "PicasaPublishing.c"
+#line 4173 "PicasaPublishing.c"
 	}
 	goto __finally11;
 	__catch11_g_file_error:
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp75_ = NULL;
-		GFile* _tmp76_ = NULL;
-		GFile* _tmp77_ = NULL;
-		gchar* _tmp78_ = NULL;
-		gchar* _tmp79_ = NULL;
-		GError* _tmp80_ = NULL;
-		const gchar* _tmp81_ = NULL;
-		gchar* _tmp82_ = NULL;
-		gchar* _tmp83_ = NULL;
-		const gchar* _tmp84_ = NULL;
-		const gchar* _tmp85_ = NULL;
-		GError* _tmp86_ = NULL;
+		SpitPublishingPublishable* _tmp75_;
+		GFile* _tmp76_;
+		GFile* _tmp77_;
+		gchar* _tmp78_;
+		gchar* _tmp79_;
+		GError* _tmp80_;
+		const gchar* _tmp81_;
+		gchar* _tmp82_;
+		gchar* _tmp83_;
+		const gchar* _tmp84_;
+		const gchar* _tmp85_;
+		GError* _tmp86_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4249,7 +4246,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		_g_free0 (msg);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
-#line 4237 "PicasaPublishing.c"
+#line 4234 "PicasaPublishing.c"
 		goto __finally11;
 	}
 	__finally11:
@@ -4273,7 +4270,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			__vala_SoupMultipart_free0 (message_parts);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4261 "PicasaPublishing.c"
+#line 4258 "PicasaPublishing.c"
 		} else {
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
@@ -4293,7 +4290,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4281 "PicasaPublishing.c"
+#line 4278 "PicasaPublishing.c"
 		}
 	}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4303,7 +4300,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data = (guint8*) _tmp88_;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	photo_data_length1 = -1;
+	photo_data_length1 = sizeof (gchar) / sizeof (guint8);
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_photo_data_size_ = photo_data_length1;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4400,7 +4397,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			__vala_SoupMultipart_free0 (message_parts);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4388 "PicasaPublishing.c"
+#line 4385 "PicasaPublishing.c"
 		} else {
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
@@ -4424,7 +4421,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4412 "PicasaPublishing.c"
+#line 4409 "PicasaPublishing.c"
 		}
 	}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4443,7 +4440,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_g_free0 (summary);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 4431 "PicasaPublishing.c"
+#line 4428 "PicasaPublishing.c"
 }
 
 
@@ -4455,19 +4452,19 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate));
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_picasa_upload_transaction_real_execute;
-#line 4444 "PicasaPublishing.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_picasa_upload_transaction_real_execute;
+#line 4441 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) {
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4451 "PicasaPublishing.c"
+#line 4448 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingPicasaUploadTransaction * self;
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -4483,7 +4480,7 @@ static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupport
 	_g_mapped_file_unref0 (self->priv->mapped_file);
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj);
-#line 4471 "PicasaPublishing.c"
+#line 4468 "PicasaPublishing.c"
 }
 
 
@@ -4502,79 +4499,78 @@ GType publishing_picasa_upload_transaction_get_type (void) {
 static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) {
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL;
-#line 4490 "PicasaPublishing.c"
+#line 4487 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 4497 "PicasaPublishing.c"
+#line 4494 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 4504 "PicasaPublishing.c"
+#line 4501 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
 	PublishingPicasaPublishingOptionsPane * self = NULL;
-	gint _tmp0_ = 0;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_ = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GtkBuilder* _tmp4_ = NULL;
-	GtkBuilder* _tmp5_ = NULL;
-	GSList* _tmp6_ = NULL;
-	GSList* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	PublishingPicasaPublishingParameters* _tmp9_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp10_ = NULL;
-	GtkBuilder* _tmp11_ = NULL;
-	GObject* _tmp12_ = NULL;
-	GtkBox* _tmp13_ = NULL;
-	GtkBuilder* _tmp14_ = NULL;
-	GObject* _tmp15_ = NULL;
-	GtkLabel* _tmp16_ = NULL;
-	GtkBuilder* _tmp17_ = NULL;
-	GObject* _tmp18_ = NULL;
-	GtkLabel* _tmp19_ = NULL;
-	GtkBuilder* _tmp20_ = NULL;
-	GObject* _tmp21_ = NULL;
-	GtkComboBoxText* _tmp22_ = NULL;
-	GtkBuilder* _tmp23_ = NULL;
-	GObject* _tmp24_ = NULL;
-	GtkCheckButton* _tmp25_ = NULL;
-	GtkBuilder* _tmp26_ = NULL;
-	GObject* _tmp27_ = NULL;
-	GtkComboBoxText* _tmp28_ = NULL;
-	GtkBuilder* _tmp29_ = NULL;
-	GObject* _tmp30_ = NULL;
-	GtkCheckButton* _tmp31_ = NULL;
-	GtkBuilder* _tmp32_ = NULL;
-	GObject* _tmp33_ = NULL;
-	GtkButton* _tmp34_ = NULL;
-	GtkBuilder* _tmp35_ = NULL;
-	GObject* _tmp36_ = NULL;
-	GtkButton* _tmp37_ = NULL;
-	gboolean _tmp38_ = FALSE;
-	GtkLabel* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
-	GtkCheckButton* _tmp50_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp51_ = NULL;
-	gboolean _tmp52_ = FALSE;
-	PublishingPicasaPublishingParameters* _tmp53_ = NULL;
-	SpitPublishingPublisherMediaType _tmp54_ = 0;
-	GtkButton* _tmp71_ = NULL;
-	GtkButton* _tmp72_ = NULL;
+	gint _tmp0_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_;
+	GtkBuilder* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GtkBuilder* _tmp4_;
+	GtkBuilder* _tmp5_;
+	GSList* _tmp6_;
+	GSList* _tmp7_;
+	guint _tmp8_;
+	PublishingPicasaPublishingParameters* _tmp9_;
+	PublishingPicasaPublishingParameters* _tmp10_;
+	GtkBuilder* _tmp11_;
+	GObject* _tmp12_;
+	GtkBox* _tmp13_;
+	GtkBuilder* _tmp14_;
+	GObject* _tmp15_;
+	GtkLabel* _tmp16_;
+	GtkBuilder* _tmp17_;
+	GObject* _tmp18_;
+	GtkLabel* _tmp19_;
+	GtkBuilder* _tmp20_;
+	GObject* _tmp21_;
+	GtkComboBoxText* _tmp22_;
+	GtkBuilder* _tmp23_;
+	GObject* _tmp24_;
+	GtkCheckButton* _tmp25_;
+	GtkBuilder* _tmp26_;
+	GObject* _tmp27_;
+	GtkComboBoxText* _tmp28_;
+	GtkBuilder* _tmp29_;
+	GObject* _tmp30_;
+	GtkCheckButton* _tmp31_;
+	GtkBuilder* _tmp32_;
+	GObject* _tmp33_;
+	GtkButton* _tmp34_;
+	GtkBuilder* _tmp35_;
+	GObject* _tmp36_;
+	GtkButton* _tmp37_;
+	gboolean _tmp38_;
+	GtkLabel* _tmp43_;
+	PublishingPicasaPublishingParameters* _tmp44_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
+	GtkCheckButton* _tmp49_;
+	PublishingPicasaPublishingParameters* _tmp50_;
+	gboolean _tmp51_;
+	PublishingPicasaPublishingParameters* _tmp52_;
+	SpitPublishingPublisherMediaType _tmp53_;
+	GtkButton* _tmp68_;
+	GtkButton* _tmp69_;
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4717,11 +4713,11 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 	_tmp38_ = can_logout;
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp38_) {
-#line 4705 "PicasaPublishing.c"
-		GtkButton* _tmp39_ = NULL;
-		GtkContainer* _tmp40_ = NULL;
-		GtkContainer* _tmp41_ = NULL;
-		GtkButton* _tmp42_ = NULL;
+#line 4701 "PicasaPublishing.c"
+		GtkButton* _tmp39_;
+		GtkContainer* _tmp40_;
+		GtkContainer* _tmp41_;
+		GtkButton* _tmp42_;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp39_ = self->priv->logout_button;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4732,189 +4728,181 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 		_tmp42_ = self->priv->logout_button;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 4720 "PicasaPublishing.c"
+#line 4716 "PicasaPublishing.c"
 	}
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp43_ = self->priv->login_identity_label;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp44_ = _ ("You are logged into Picasa Web Albums as %s.");
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp45_ = parameters;
+	_tmp44_ = parameters;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp46_ = publishing_picasa_publishing_parameters_get_user_name (_tmp45_);
+	_tmp45_ = publishing_picasa_publishing_parameters_get_user_name (_tmp44_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp47_ = _tmp46_;
+	_tmp46_ = _tmp45_;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp48_ = g_strdup_printf (_tmp44_, _tmp47_);
+	_tmp47_ = g_strdup_printf (_ ("You are logged into Picasa Web Albums as %s."), _tmp46_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp49_ = _tmp48_;
+	_tmp48_ = _tmp47_;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_label_set_label (_tmp43_, _tmp49_);
+	gtk_label_set_label (_tmp43_, _tmp48_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp49_);
+	_g_free0 (_tmp48_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp47_);
+	_g_free0 (_tmp46_);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp50_ = self->priv->strip_metadata_check;
+	_tmp49_ = self->priv->strip_metadata_check;
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp51_ = parameters;
+	_tmp50_ = parameters;
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp52_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp51_);
+	_tmp51_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp50_);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp51_);
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp53_ = parameters;
+	_tmp52_ = parameters;
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp54_ = publishing_picasa_publishing_parameters_get_media_type (_tmp53_);
+	_tmp53_ = publishing_picasa_publishing_parameters_get_media_type (_tmp52_);
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if ((_tmp54_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
-#line 4756 "PicasaPublishing.c"
-		GtkLabel* _tmp55_ = NULL;
-		const gchar* _tmp56_ = NULL;
-		GtkComboBoxText* _tmp57_ = NULL;
-		GtkComboBoxText* _tmp58_ = NULL;
+	if ((_tmp53_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
+#line 4750 "PicasaPublishing.c"
+		GtkLabel* _tmp54_;
+		GtkComboBoxText* _tmp55_;
+		GtkComboBoxText* _tmp56_;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp55_ = self->priv->publish_to_label;
+		_tmp54_ = self->priv->publish_to_label;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp56_ = _ ("Videos will appear in:");
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_label_set_label (_tmp55_, _tmp56_);
+		gtk_label_set_label (_tmp54_, _ ("Videos will appear in:"));
 #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp57_ = self->priv->size_combo;
+		_tmp55_ = self->priv->size_combo;
 #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp58_ = self->priv->size_combo;
+		_tmp56_ = self->priv->size_combo;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4775 "PicasaPublishing.c"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4766 "PicasaPublishing.c"
 	} else {
-		GtkLabel* _tmp59_ = NULL;
-		const gchar* _tmp60_ = NULL;
-		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp61_ = NULL;
-		gint _tmp61__length1 = 0;
-		GtkComboBoxText* _tmp66_ = NULL;
-		GtkComboBoxText* _tmp67_ = NULL;
-		GtkComboBoxText* _tmp68_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp69_ = NULL;
-		gint _tmp70_ = 0;
-#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp59_ = self->priv->publish_to_label;
+		GtkLabel* _tmp57_;
+		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp58_;
+		gint _tmp58__length1;
+		GtkComboBoxText* _tmp63_;
+		GtkComboBoxText* _tmp64_;
+		GtkComboBoxText* _tmp65_;
+		PublishingPicasaPublishingParameters* _tmp66_;
+		gint _tmp67_;
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp60_ = _ ("Photos will appear in:");
+		_tmp57_ = self->priv->publish_to_label;
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_label_set_label (_tmp59_, _tmp60_);
+		gtk_label_set_label (_tmp57_, _ ("Photos will appear in:"));
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp61_ = self->priv->size_descriptions;
+		_tmp58_ = self->priv->size_descriptions;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp61__length1 = self->priv->size_descriptions_length1;
-#line 4796 "PicasaPublishing.c"
+		_tmp58__length1 = self->priv->size_descriptions_length1;
+#line 4784 "PicasaPublishing.c"
 		{
 			PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
 			gint desc_collection_length1 = 0;
 			gint _desc_collection_size_ = 0;
 			gint desc_it = 0;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection = _tmp61_;
+			desc_collection = _tmp58_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection_length1 = _tmp61__length1;
+			desc_collection_length1 = _tmp58__length1;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			for (desc_it = 0; desc_it < _tmp61__length1; desc_it = desc_it + 1) {
-#line 4808 "PicasaPublishing.c"
-				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp62_ = NULL;
+			for (desc_it = 0; desc_it < _tmp58__length1; desc_it = desc_it + 1) {
+#line 4796 "PicasaPublishing.c"
+				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp59_;
 				PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp62_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
+				_tmp59_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				desc = _tmp62_;
-#line 4815 "PicasaPublishing.c"
+				desc = _tmp59_;
+#line 4803 "PicasaPublishing.c"
 				{
-					GtkComboBoxText* _tmp63_ = NULL;
-					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp64_ = NULL;
-					const gchar* _tmp65_ = NULL;
+					GtkComboBoxText* _tmp60_;
+					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp61_;
+					const gchar* _tmp62_;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp63_ = self->priv->size_combo;
+					_tmp60_ = self->priv->size_combo;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp64_ = desc;
+					_tmp61_ = desc;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp65_ = _tmp64_->name;
+					_tmp62_ = _tmp61_->name;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp63_, _tmp65_);
+					gtk_combo_box_text_append_text (_tmp60_, _tmp62_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_publishing_picasa_publishing_options_pane_size_description_unref0 (desc);
-#line 4830 "PicasaPublishing.c"
+#line 4818 "PicasaPublishing.c"
 				}
 			}
 		}
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp66_ = self->priv->size_combo;
+		_tmp63_ = self->priv->size_combo;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp67_ = self->priv->size_combo;
+		_tmp64_ = self->priv->size_combo;
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp68_ = self->priv->size_combo;
+		_tmp65_ = self->priv->size_combo;
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp69_ = parameters;
+		_tmp66_ = parameters;
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp70_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp69_);
+		_tmp67_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp66_);
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_combo_box_get_type (), GtkComboBox), _tmp70_);
-#line 4850 "PicasaPublishing.c"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_combo_box_get_type (), GtkComboBox), _tmp67_);
+#line 4838 "PicasaPublishing.c"
 	}
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp71_ = self->priv->logout_button;
+	_tmp68_ = self->priv->logout_button;
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp72_ = self->priv->publish_button;
+	_tmp69_ = self->priv->publish_button;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp69_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 4862 "PicasaPublishing.c"
+#line 4850 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters, can_logout);
-#line 4869 "PicasaPublishing.c"
+#line 4857 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self) {
 	gint _tmp0_ = 0;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
 	gint size_combo_last_active = 0;
-	PublishingPicasaPublishingParameters* _tmp5_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp6_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	PublishingPicasaPublishingParameters* _tmp10_ = NULL;
-	GtkCheckButton* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	PublishingPicasaPublishingParameters* _tmp5_;
+	PublishingPicasaPublishingParameters* _tmp6_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_;
+	gint _tmp7__length1;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_;
+	gint _tmp9_;
+	PublishingPicasaPublishingParameters* _tmp10_;
+	GtkCheckButton* _tmp11_;
+	gboolean _tmp12_;
 	PublishingPicasaAlbum** albums = NULL;
-	PublishingPicasaPublishingParameters* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	PublishingPicasaAlbum** _tmp15_ = NULL;
-	gint albums_length1 = 0;
-	gint _albums_size_ = 0;
-	PublishingPicasaPublishingParameters* _tmp16_ = NULL;
-	GtkComboBoxText* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	PublishingPicasaAlbum* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp21_ = NULL;
-	GtkComboBoxText* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	PublishingPicasaAlbum* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp13_;
+	gint _tmp14_;
+	PublishingPicasaAlbum** _tmp15_;
+	gint albums_length1;
+	gint _albums_size_;
+	PublishingPicasaPublishingParameters* _tmp16_;
+	GtkComboBoxText* _tmp17_;
+	gint _tmp18_;
+	PublishingPicasaAlbum* _tmp19_;
+	const gchar* _tmp20_;
+	PublishingPicasaPublishingParameters* _tmp21_;
+	GtkComboBoxText* _tmp22_;
+	gint _tmp23_;
+	PublishingPicasaAlbum* _tmp24_;
+	const gchar* _tmp25_;
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4923,20 +4911,20 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_ >= 0) {
-#line 4911 "PicasaPublishing.c"
-		GtkComboBoxText* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
+#line 4899 "PicasaPublishing.c"
+		GtkComboBoxText* _tmp3_;
+		gint _tmp4_;
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = self->priv->size_combo;
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _tmp4_;
-#line 4920 "PicasaPublishing.c"
+#line 4908 "PicasaPublishing.c"
 	} else {
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = 0;
-#line 4924 "PicasaPublishing.c"
+#line 4912 "PicasaPublishing.c"
 	}
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	size_combo_last_active = _tmp0_;
@@ -4999,10 +4987,10 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp21_, _tmp25_);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_emit_by_name (self, "publish");
+	g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 4990 "PicasaPublishing.c"
+#line 4978 "PicasaPublishing.c"
 }
 
 
@@ -5010,124 +4998,119 @@ static void publishing_picasa_publishing_options_pane_on_logout_clicked (Publish
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 4999 "PicasaPublishing.c"
+	g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 4987 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5010 "PicasaPublishing.c"
+#line 4998 "PicasaPublishing.c"
 	}
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5016 "PicasaPublishing.c"
+#line 5004 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5027 "PicasaPublishing.c"
+#line 5015 "PicasaPublishing.c"
 	}
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5033 "PicasaPublishing.c"
+#line 5021 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5044 "PicasaPublishing.c"
+#line 5032 "PicasaPublishing.c"
 	}
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5050 "PicasaPublishing.c"
+#line 5038 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5061 "PicasaPublishing.c"
+#line 5049 "PicasaPublishing.c"
 	}
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5067 "PicasaPublishing.c"
+#line 5055 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5078 "PicasaPublishing.c"
+#line 5066 "PicasaPublishing.c"
 	}
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5084 "PicasaPublishing.c"
+#line 5072 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription** result = NULL;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _result_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp3_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp6_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp9_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	const gchar* _tmp11_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp12_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	const gchar* _tmp14_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp15_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_;
+	gint _tmp1__length1;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp2_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp3_;
+	gint _tmp3__length1;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp4_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp5_;
+	gint _tmp5__length1;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp6_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_;
+	gint _tmp7__length1;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp9_;
+	gint _tmp9__length1;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp10_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp11_;
+	gint _tmp11__length1;
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5143,81 +5126,71 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = _ ("Small (640 × 480 pixels)");
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp2_, 640);
+	_tmp2_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Small (640 × 480 pixels)"), 640);
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = _result_;
+	_tmp3_ = _result_;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3__length1 = _result__length1;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = _ ("Medium (1024 × 768 pixels)");
+	_tmp4_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Medium (1024 × 768 pixels)"), 1024);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp5_, 1024);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _result_;
+	_tmp5_ = _result_;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5__length1 = _result__length1;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = _ ("Recommended (1600 × 1200 pixels)");
+	_tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Recommended (1600 × 1200 pixels)"), 1600);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp8_, 1600);
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = _result_;
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7_ = _result_;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = _ ("Google+ (2048 × 1536 pixels)");
+	_tmp7__length1 = _result__length1;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp11_, 2048);
+	_tmp8_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Google+ (2048 × 1536 pixels)"), 2048);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = _result_;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13__length1 = _result__length1;
+	_tmp9_ = _result_;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = _ ("Original Size");
+	_tmp9__length1 = _result__length1;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp14_, PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE);
+	_tmp10_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Original Size"), PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp16_ = _result_;
+	_tmp11_ = _result_;
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp16__length1 = _result__length1;
+	_tmp11__length1 = _result__length1;
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		*result_length1 = _tmp16__length1;
-#line 5184 "PicasaPublishing.c"
+		*result_length1 = _tmp11__length1;
+#line 5157 "PicasaPublishing.c"
 	}
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp16_;
+	result = _tmp11_;
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5190 "PicasaPublishing.c"
+#line 5163 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self) {
 	gint default_album_id = 0;
 	gchar* last_album = NULL;
-	PublishingPicasaPublishingParameters* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp0_;
+	gchar* _tmp1_;
 	PublishingPicasaAlbum** albums = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	PublishingPicasaAlbum** _tmp4_ = NULL;
-	gint albums_length1 = 0;
-	gint _albums_size_ = 0;
-	gint _tmp33_ = 0;
+	PublishingPicasaPublishingParameters* _tmp2_;
+	gint _tmp3_;
+	PublishingPicasaAlbum** _tmp4_;
+	gint albums_length1;
+	gint _albums_size_;
+	gint _tmp32_;
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5238,44 +5211,44 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	albums_length1 = _tmp3_;
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
-#line 5226 "PicasaPublishing.c"
+#line 5199 "PicasaPublishing.c"
 	{
 		gint i = 0;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		i = 0;
-#line 5231 "PicasaPublishing.c"
+#line 5204 "PicasaPublishing.c"
 		{
 			gboolean _tmp5_ = FALSE;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp5_ = TRUE;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			while (TRUE) {
-#line 5238 "PicasaPublishing.c"
-				gint _tmp7_ = 0;
-				PublishingPicasaAlbum** _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
-				GtkComboBoxText* _tmp9_ = NULL;
-				PublishingPicasaAlbum** _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				PublishingPicasaAlbum* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
+#line 5211 "PicasaPublishing.c"
+				gint _tmp7_;
+				PublishingPicasaAlbum** _tmp8_;
+				gint _tmp8__length1;
+				GtkComboBoxText* _tmp9_;
+				PublishingPicasaAlbum** _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				PublishingPicasaAlbum* _tmp12_;
+				const gchar* _tmp13_;
 				gboolean _tmp14_ = FALSE;
-				PublishingPicasaAlbum** _tmp15_ = NULL;
-				gint _tmp15__length1 = 0;
-				gint _tmp16_ = 0;
-				PublishingPicasaAlbum* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
+				PublishingPicasaAlbum** _tmp15_;
+				gint _tmp15__length1;
+				gint _tmp16_;
+				PublishingPicasaAlbum* _tmp17_;
+				const gchar* _tmp18_;
+				const gchar* _tmp19_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (!_tmp5_) {
-#line 5257 "PicasaPublishing.c"
-					gint _tmp6_ = 0;
+#line 5230 "PicasaPublishing.c"
+					gint _tmp6_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp6_ = i;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					i = _tmp6_ + 1;
-#line 5263 "PicasaPublishing.c"
+#line 5236 "PicasaPublishing.c"
 				}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp5_ = FALSE;
@@ -5289,7 +5262,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				if (!(_tmp7_ < _tmp8__length1)) {
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					break;
-#line 5277 "PicasaPublishing.c"
+#line 5250 "PicasaPublishing.c"
 				}
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = self->priv->existing_albums_combo;
@@ -5321,15 +5294,15 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				if (g_strcmp0 (_tmp18_, _tmp19_) == 0) {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = TRUE;
-#line 5309 "PicasaPublishing.c"
+#line 5282 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp20_ = FALSE;
 					gboolean _tmp21_ = FALSE;
-					PublishingPicasaAlbum** _tmp22_ = NULL;
-					gint _tmp22__length1 = 0;
-					gint _tmp23_ = 0;
-					PublishingPicasaAlbum* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
+					PublishingPicasaAlbum** _tmp22_;
+					gint _tmp22__length1;
+					gint _tmp23_;
+					PublishingPicasaAlbum* _tmp24_;
+					const gchar* _tmp25_;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp22_ = albums;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5344,14 +5317,13 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 					if (g_strcmp0 (_tmp25_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp21_ = TRUE;
-#line 5332 "PicasaPublishing.c"
+#line 5305 "PicasaPublishing.c"
 					} else {
-						PublishingPicasaAlbum** _tmp26_ = NULL;
-						gint _tmp26__length1 = 0;
-						gint _tmp27_ = 0;
-						PublishingPicasaAlbum* _tmp28_ = NULL;
-						const gchar* _tmp29_ = NULL;
-						const gchar* _tmp30_ = NULL;
+						PublishingPicasaAlbum** _tmp26_;
+						gint _tmp26__length1;
+						gint _tmp27_;
+						PublishingPicasaAlbum* _tmp28_;
+						const gchar* _tmp29_;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp26_ = albums;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5363,70 +5335,68 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp29_ = _tmp28_->name;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp30_ = _ ("Default album");
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp21_ = g_strcmp0 (_tmp29_, _tmp30_) == 0;
-#line 5354 "PicasaPublishing.c"
+						_tmp21_ = g_strcmp0 (_tmp29_, _ ("Default album")) == 0;
+#line 5324 "PicasaPublishing.c"
 					}
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp21_) {
-#line 5358 "PicasaPublishing.c"
-						gint _tmp31_ = 0;
+#line 5328 "PicasaPublishing.c"
+						gint _tmp30_;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp31_ = default_album_id;
+						_tmp30_ = default_album_id;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp20_ = _tmp31_ == -1;
-#line 5364 "PicasaPublishing.c"
+						_tmp20_ = _tmp30_ == -1;
+#line 5334 "PicasaPublishing.c"
 					} else {
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = FALSE;
-#line 5368 "PicasaPublishing.c"
+#line 5338 "PicasaPublishing.c"
 					}
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = _tmp20_;
-#line 5372 "PicasaPublishing.c"
+#line 5342 "PicasaPublishing.c"
 				}
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (_tmp14_) {
-#line 5376 "PicasaPublishing.c"
-					gint _tmp32_ = 0;
+#line 5346 "PicasaPublishing.c"
+					gint _tmp31_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp32_ = i;
+					_tmp31_ = i;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					default_album_id = _tmp32_;
-#line 5382 "PicasaPublishing.c"
+					default_album_id = _tmp31_;
+#line 5352 "PicasaPublishing.c"
 				}
 			}
 		}
 	}
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp33_ = default_album_id;
+	_tmp32_ = default_album_id;
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp33_ >= 0) {
-#line 5391 "PicasaPublishing.c"
-		GtkComboBoxText* _tmp34_ = NULL;
-		gint _tmp35_ = 0;
+	if (_tmp32_ >= 0) {
+#line 5361 "PicasaPublishing.c"
+		GtkComboBoxText* _tmp33_;
+		gint _tmp34_;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp34_ = self->priv->existing_albums_combo;
+		_tmp33_ = self->priv->existing_albums_combo;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp35_ = default_album_id;
+		_tmp34_ = default_album_id;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), _tmp35_);
-#line 5400 "PicasaPublishing.c"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), _tmp34_);
+#line 5370 "PicasaPublishing.c"
 	}
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (last_album);
-#line 5406 "PicasaPublishing.c"
+#line 5376 "PicasaPublishing.c"
 }
 
 
 static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingPicasaPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5437,7 +5407,7 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi
 	result = _tmp1_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5425 "PicasaPublishing.c"
+#line 5395 "PicasaPublishing.c"
 }
 
 
@@ -5450,7 +5420,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_opti
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5438 "PicasaPublishing.c"
+#line 5408 "PicasaPublishing.c"
 }
 
 
@@ -5460,7 +5430,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_installed (Sp
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
 #line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_installed (self);
-#line 5448 "PicasaPublishing.c"
+#line 5418 "PicasaPublishing.c"
 }
 
 
@@ -5468,15 +5438,15 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingPicasaPublishingOptionsPane * self;
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 5456 "PicasaPublishing.c"
+#line 5426 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5495,21 +5465,21 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_p
 	self->major_axis_pixels = _tmp2_;
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 5483 "PicasaPublishing.c"
+#line 5453 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) {
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels);
-#line 5490 "PicasaPublishing.c"
+#line 5460 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5497 "PicasaPublishing.c"
+#line 5467 "PicasaPublishing.c"
 }
 
 
@@ -5518,7 +5488,7 @@ static void publishing_picasa_publishing_options_pane_value_size_description_fre
 	if (value->data[0].v_pointer) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer);
-#line 5506 "PicasaPublishing.c"
+#line 5476 "PicasaPublishing.c"
 	}
 }
 
@@ -5528,11 +5498,11 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop
 	if (src_value->data[0].v_pointer) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer);
-#line 5516 "PicasaPublishing.c"
+#line 5486 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5520 "PicasaPublishing.c"
+#line 5490 "PicasaPublishing.c"
 	}
 }
 
@@ -5540,66 +5510,66 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop
 static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5528 "PicasaPublishing.c"
+#line 5498 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5535 "PicasaPublishing.c"
-		PublishingPicasaPublishingOptionsPaneSizeDescription* object;
+#line 5505 "PicasaPublishing.c"
+		PublishingPicasaPublishingOptionsPaneSizeDescription * object;
 		object = collect_values[0].v_pointer;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5542 "PicasaPublishing.c"
+#line 5512 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5546 "PicasaPublishing.c"
+#line 5516 "PicasaPublishing.c"
 		}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object);
-#line 5550 "PicasaPublishing.c"
+#line 5520 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5554 "PicasaPublishing.c"
+#line 5524 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 5558 "PicasaPublishing.c"
+#line 5528 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_publishing_options_pane_value_size_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingPicasaPublishingOptionsPaneSizeDescription** object_p;
+	PublishingPicasaPublishingOptionsPaneSizeDescription ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5569 "PicasaPublishing.c"
+#line 5539 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 5575 "PicasaPublishing.c"
+#line 5545 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5579 "PicasaPublishing.c"
+#line 5549 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 5583 "PicasaPublishing.c"
+#line 5553 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 5587 "PicasaPublishing.c"
+#line 5557 "PicasaPublishing.c"
 }
 
 
@@ -5613,7 +5583,7 @@ static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_des
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 5601 "PicasaPublishing.c"
+#line 5571 "PicasaPublishing.c"
 }
 
 
@@ -5622,12 +5592,12 @@ static gpointer publishing_picasa_publishing_options_pane_value_get_size_descrip
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5610 "PicasaPublishing.c"
+#line 5580 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) {
-	PublishingPicasaPublishingOptionsPaneSizeDescription* old;
+	PublishingPicasaPublishingOptionsPaneSizeDescription * old;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5642,23 +5612,23 @@ static void publishing_picasa_publishing_options_pane_value_set_size_description
 		value->data[0].v_pointer = v_object;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 5630 "PicasaPublishing.c"
+#line 5600 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5634 "PicasaPublishing.c"
+#line 5604 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 5640 "PicasaPublishing.c"
+#line 5610 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) {
-	PublishingPicasaPublishingOptionsPaneSizeDescription* old;
+	PublishingPicasaPublishingOptionsPaneSizeDescription * old;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5671,17 +5641,17 @@ static void publishing_picasa_publishing_options_pane_value_take_size_descriptio
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 5659 "PicasaPublishing.c"
+#line 5629 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5663 "PicasaPublishing.c"
+#line 5633 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 5669 "PicasaPublishing.c"
+#line 5639 "PicasaPublishing.c"
 	}
 }
 
@@ -5691,18 +5661,18 @@ static void publishing_picasa_publishing_options_pane_size_description_class_ini
 	publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize;
-#line 5679 "PicasaPublishing.c"
+#line 5649 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 5686 "PicasaPublishing.c"
+#line 5656 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription* obj) {
+static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, PublishingPicasaPublishingOptionsPaneSizeDescription);
@@ -5710,7 +5680,7 @@ static void publishing_picasa_publishing_options_pane_size_description_finalize
 	g_signal_handlers_destroy (self);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 5698 "PicasaPublishing.c"
+#line 5668 "PicasaPublishing.c"
 }
 
 
@@ -5729,18 +5699,18 @@ static GType publishing_picasa_publishing_options_pane_size_description_get_type
 
 
 static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance) {
-	PublishingPicasaPublishingOptionsPaneSizeDescription* self;
+	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
 	self = instance;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 5723 "PicasaPublishing.c"
+#line 5693 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance) {
-	PublishingPicasaPublishingOptionsPaneSizeDescription* self;
+	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
 	self = instance;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5748,7 +5718,7 @@ static void publishing_picasa_publishing_options_pane_size_description_unref (gp
 		PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5736 "PicasaPublishing.c"
+#line 5706 "PicasaPublishing.c"
 	}
 }
 
@@ -5761,10 +5731,10 @@ static void publishing_picasa_publishing_options_pane_class_init (PublishingPica
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_picasa_publishing_options_pane_finalize;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 5752 "PicasaPublishing.c"
+	publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 5722 "PicasaPublishing.c"
 }
 
 
@@ -5772,14 +5742,14 @@ static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pan
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_get_widget;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_get_preferred_geometry;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled;
-#line 5767 "PicasaPublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled;
+#line 5737 "PicasaPublishing.c"
 }
 
 
@@ -5806,11 +5776,11 @@ static void publishing_picasa_publishing_options_pane_instance_init (PublishingP
 	self->priv->publish_button = NULL;
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 5794 "PicasaPublishing.c"
+#line 5764 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) {
+static void publishing_picasa_publishing_options_pane_finalize (GObject * obj) {
 	PublishingPicasaPublishingOptionsPane * self;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
@@ -5840,7 +5810,7 @@ static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) {
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj);
-#line 5828 "PicasaPublishing.c"
+#line 5798 "PicasaPublishing.c"
 }
 
 
@@ -5860,7 +5830,7 @@ GType publishing_picasa_publishing_options_pane_get_type (void) {
 
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type) {
 	PublishingPicasaPublishingParameters* self = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingParameters*) g_type_create_instance (object_type);
 #line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5897,21 +5867,21 @@ PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_co
 	self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 5885 "PicasaPublishing.c"
+#line 5855 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) {
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS);
-#line 5892 "PicasaPublishing.c"
+#line 5862 "PicasaPublishing.c"
 }
 
 
 gchar* publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5922,13 +5892,13 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing
 	result = _tmp1_;
 #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5910 "PicasaPublishing.c"
+#line 5880 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5941,13 +5911,13 @@ void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPi
 	_g_free0 (self->priv->target_album_name);
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_name = _tmp1_;
-#line 5929 "PicasaPublishing.c"
+#line 5899 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5960,14 +5930,14 @@ void publishing_picasa_publishing_parameters_set_target_album_entry_url (Publish
 	_g_free0 (self->priv->target_album_url);
 #line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_url = _tmp1_;
-#line 5948 "PicasaPublishing.c"
+#line 5918 "PicasaPublishing.c"
 }
 
 
 gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5978,126 +5948,168 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi
 	result = _tmp1_;
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5966 "PicasaPublishing.c"
+#line 5936 "PicasaPublishing.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 5979 "PicasaPublishing.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 5955 "PicasaPublishing.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 5962 "PicasaPublishing.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 5968 "PicasaPublishing.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 5978 "PicasaPublishing.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 5982 "PicasaPublishing.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 5990 "PicasaPublishing.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6010 "PicasaPublishing.c"
+#line 6022 "PicasaPublishing.c"
 				goto __catch12_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6019 "PicasaPublishing.c"
+#line 6031 "PicasaPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6035 "PicasaPublishing.c"
+#line 6047 "PicasaPublishing.c"
 				goto __catch12_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6046 "PicasaPublishing.c"
+#line 6058 "PicasaPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 6060 "PicasaPublishing.c"
+#line 6072 "PicasaPublishing.c"
 	}
 	goto __finally12;
 	__catch12_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 6074 "PicasaPublishing.c"
+#line 6086 "PicasaPublishing.c"
 	}
 	__finally12:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 6085 "PicasaPublishing.c"
+#line 6097 "PicasaPublishing.c"
 	}
 }
 
@@ -6105,9 +6117,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self) {
 	gchar* result = NULL;
 	gchar* entry_url = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* feed_url = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp1_;
 #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6124,14 +6136,14 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
 	_g_free0 (entry_url);
 #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6112 "PicasaPublishing.c"
+#line 6124 "PicasaPublishing.c"
 }
 
 
 gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6142,13 +6154,13 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu
 	result = _tmp1_;
 #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6130 "PicasaPublishing.c"
+#line 6142 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6161,14 +6173,14 @@ void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPubl
 	_g_free0 (self->priv->user_name);
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 6149 "PicasaPublishing.c"
+#line 6161 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_album_ref0 (gpointer self) {
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_album_ref (self) : NULL;
-#line 6156 "PicasaPublishing.c"
+#line 6168 "PicasaPublishing.c"
 }
 
 
@@ -6179,28 +6191,28 @@ static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, i
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6167 "PicasaPublishing.c"
-		PublishingPicasaAlbum* _tmp0_ = NULL;
+#line 6179 "PicasaPublishing.c"
+		PublishingPicasaAlbum* _tmp0_;
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 6173 "PicasaPublishing.c"
+#line 6185 "PicasaPublishing.c"
 	}
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6177 "PicasaPublishing.c"
+#line 6189 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self, int* result_length1) {
 	PublishingPicasaAlbum** result = NULL;
-	PublishingPicasaAlbum** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingPicasaAlbum** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingPicasaAlbum** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	PublishingPicasaAlbum** _tmp0_;
+	gint _tmp0__length1;
+	PublishingPicasaAlbum** _tmp1_;
+	gint _tmp1__length1;
+	PublishingPicasaAlbum** _tmp2_;
+	gint _tmp2__length1;
 #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6219,13 +6231,13 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 	if (result_length1) {
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 6207 "PicasaPublishing.c"
+#line 6219 "PicasaPublishing.c"
 	}
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp2_;
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6213 "PicasaPublishing.c"
+#line 6225 "PicasaPublishing.c"
 }
 
 
@@ -6236,25 +6248,25 @@ static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, i
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6224 "PicasaPublishing.c"
-		PublishingPicasaAlbum* _tmp0_ = NULL;
+#line 6236 "PicasaPublishing.c"
+		PublishingPicasaAlbum* _tmp0_;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 6230 "PicasaPublishing.c"
+#line 6242 "PicasaPublishing.c"
 	}
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6234 "PicasaPublishing.c"
+#line 6246 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self, PublishingPicasaAlbum** albums, int albums_length1) {
-	PublishingPicasaAlbum** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingPicasaAlbum** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	PublishingPicasaAlbum** _tmp0_;
+	gint _tmp0__length1;
+	PublishingPicasaAlbum** _tmp1_;
+	gint _tmp1__length1;
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6273,25 +6285,25 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish
 	self->priv->albums_length1 = _tmp1__length1;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 6261 "PicasaPublishing.c"
+#line 6273 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = pixels;
 #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_pixels = _tmp0_;
-#line 6273 "PicasaPublishing.c"
+#line 6285 "PicasaPublishing.c"
 }
 
 
 gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
 #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6300,25 +6312,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (Publish
 	result = _tmp0_;
 #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6288 "PicasaPublishing.c"
+#line 6300 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = selection_id;
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_selection_id = _tmp0_;
-#line 6300 "PicasaPublishing.c"
+#line 6312 "PicasaPublishing.c"
 }
 
 
 gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6327,25 +6339,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (P
 	result = _tmp0_;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6315 "PicasaPublishing.c"
+#line 6327 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = strip_metadata;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata = _tmp0_;
-#line 6327 "PicasaPublishing.c"
+#line 6339 "PicasaPublishing.c"
 }
 
 
 gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE);
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6354,25 +6366,25 @@ gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingP
 	result = _tmp0_;
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6342 "PicasaPublishing.c"
+#line 6354 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type) {
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	SpitPublishingPublisherMediaType _tmp0_;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = media_type;
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->media_type = _tmp0_;
-#line 6354 "PicasaPublishing.c"
+#line 6366 "PicasaPublishing.c"
 }
 
 
 SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self) {
 	SpitPublishingPublisherMediaType result = 0;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	SpitPublishingPublisherMediaType _tmp0_;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6381,14 +6393,14 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med
 	result = _tmp0_;
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6369 "PicasaPublishing.c"
+#line 6381 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_publishing_parameters_init (GValue* value) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6376 "PicasaPublishing.c"
+#line 6388 "PicasaPublishing.c"
 }
 
 
@@ -6397,7 +6409,7 @@ static void publishing_picasa_value_publishing_parameters_free_value (GValue* va
 	if (value->data[0].v_pointer) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer);
-#line 6385 "PicasaPublishing.c"
+#line 6397 "PicasaPublishing.c"
 	}
 }
 
@@ -6407,11 +6419,11 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal
 	if (src_value->data[0].v_pointer) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 6395 "PicasaPublishing.c"
+#line 6407 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6399 "PicasaPublishing.c"
+#line 6411 "PicasaPublishing.c"
 	}
 }
 
@@ -6419,66 +6431,66 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal
 static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6407 "PicasaPublishing.c"
+#line 6419 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6414 "PicasaPublishing.c"
-		PublishingPicasaPublishingParameters* object;
+#line 6426 "PicasaPublishing.c"
+		PublishingPicasaPublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6421 "PicasaPublishing.c"
+#line 6433 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6425 "PicasaPublishing.c"
+#line 6437 "PicasaPublishing.c"
 		}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object);
-#line 6429 "PicasaPublishing.c"
+#line 6441 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6433 "PicasaPublishing.c"
+#line 6445 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6437 "PicasaPublishing.c"
+#line 6449 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingPicasaPublishingParameters** object_p;
+	PublishingPicasaPublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6448 "PicasaPublishing.c"
+#line 6460 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 6454 "PicasaPublishing.c"
+#line 6466 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6458 "PicasaPublishing.c"
+#line 6470 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 6462 "PicasaPublishing.c"
+#line 6474 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6466 "PicasaPublishing.c"
+#line 6478 "PicasaPublishing.c"
 }
 
 
@@ -6492,7 +6504,7 @@ GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* nam
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6480 "PicasaPublishing.c"
+#line 6492 "PicasaPublishing.c"
 }
 
 
@@ -6501,12 +6513,12 @@ gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6489 "PicasaPublishing.c"
+#line 6501 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingPicasaPublishingParameters* old;
+	PublishingPicasaPublishingParameters * old;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6521,23 +6533,23 @@ void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer
 		value->data[0].v_pointer = v_object;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 6509 "PicasaPublishing.c"
+#line 6521 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6513 "PicasaPublishing.c"
+#line 6525 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 6519 "PicasaPublishing.c"
+#line 6531 "PicasaPublishing.c"
 	}
 }
 
 
 void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingPicasaPublishingParameters* old;
+	PublishingPicasaPublishingParameters * old;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6550,17 +6562,17 @@ void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6538 "PicasaPublishing.c"
+#line 6550 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6542 "PicasaPublishing.c"
+#line 6554 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 6548 "PicasaPublishing.c"
+#line 6560 "PicasaPublishing.c"
 	}
 }
 
@@ -6572,7 +6584,7 @@ static void publishing_picasa_publishing_parameters_class_init (PublishingPicasa
 	((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate));
-#line 6560 "PicasaPublishing.c"
+#line 6572 "PicasaPublishing.c"
 }
 
 
@@ -6581,11 +6593,11 @@ static void publishing_picasa_publishing_parameters_instance_init (PublishingPic
 	self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 6569 "PicasaPublishing.c"
+#line 6581 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj) {
+static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj) {
 	PublishingPicasaPublishingParameters * self;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParameters);
@@ -6599,7 +6611,7 @@ static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPu
 	_g_free0 (self->priv->user_name);
 #line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 6587 "PicasaPublishing.c"
+#line 6599 "PicasaPublishing.c"
 }
 
 
@@ -6618,18 +6630,18 @@ GType publishing_picasa_publishing_parameters_get_type (void) {
 
 
 gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) {
-	PublishingPicasaPublishingParameters* self;
+	PublishingPicasaPublishingParameters * self;
 	self = instance;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 6612 "PicasaPublishing.c"
+#line 6624 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_unref (gpointer instance) {
-	PublishingPicasaPublishingParameters* self;
+	PublishingPicasaPublishingParameters * self;
 	self = instance;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -6637,18 +6649,18 @@ void publishing_picasa_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6625 "PicasaPublishing.c"
+#line 6637 "PicasaPublishing.c"
 	}
 }
 
 
 PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
 	PublishingPicasaUploader* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp3_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingPicasaPublishingParameters* _tmp2_;
+	PublishingPicasaPublishingParameters* _tmp3_;
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6671,27 +6683,27 @@ PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_typ
 	self->priv->parameters = _tmp3_;
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6659 "PicasaPublishing.c"
+#line 6671 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6666 "PicasaPublishing.c"
+#line 6678 "PicasaPublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingPicasaUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	PublishingPicasaUploadTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
+	PublishingPicasaPublishingParameters* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
+	PublishingPicasaUploadTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
 #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
 #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6718,7 +6730,7 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
 	result = _tmp6_;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6706 "PicasaPublishing.c"
+#line 6718 "PicasaPublishing.c"
 }
 
 
@@ -6730,19 +6742,19 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate));
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_picasa_uploader_real_create_transaction;
-#line 6719 "PicasaPublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_picasa_uploader_real_create_transaction;
+#line 6731 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) {
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self);
-#line 6726 "PicasaPublishing.c"
+#line 6738 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingPicasaUploader * self;
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
@@ -6750,7 +6762,7 @@ static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploa
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj);
-#line 6738 "PicasaPublishing.c"
+#line 6750 "PicasaPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index 3e50423..2323b7f 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -1,4 +1,4 @@
-/* PiwigoPublishing.c generated by valac 0.34.7, the Vala compiler
+/* PiwigoPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from PiwigoPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -236,8 +236,24 @@ typedef struct _PublishingPiwigoImagesAddTransaction PublishingPiwigoImagesAddTr
 typedef struct _PublishingPiwigoImagesAddTransactionClass PublishingPiwigoImagesAddTransactionClass;
 typedef struct _PublishingPiwigoSSLErrorPanePrivate PublishingPiwigoSSLErrorPanePrivate;
 #define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
+enum  {
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL
+};
+static guint publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingPiwigoAuthenticationPanePrivate PublishingPiwigoAuthenticationPanePrivate;
+enum  {
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL,
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL
+};
+static guint publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingPiwigoPublishingOptionsPanePrivate PublishingPiwigoPublishingOptionsPanePrivate;
+enum  {
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingPiwigoSessionPrivate PublishingPiwigoSessionPrivate;
 typedef struct _PublishingPiwigoTransactionPrivate PublishingPiwigoTransactionPrivate;
 typedef struct _PublishingPiwigoSessionLoginTransactionPrivate PublishingPiwigoSessionLoginTransactionPrivate;
@@ -543,14 +559,14 @@ static gint piwigo_service_icon_pixbuf_set_length1;
 static GdkPixbuf** piwigo_service_icon_pixbuf_set = NULL;
 static gint piwigo_service_icon_pixbuf_set_length1 = 0;
 static gint _piwigo_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* piwigo_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* piwigo_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * piwigo_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * piwigo_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_piwigo_category_parent_class = NULL;
 static gpointer publishing_piwigo_permission_level_parent_class = NULL;
 static gpointer publishing_piwigo_size_entry_parent_class = NULL;
 static gpointer publishing_piwigo_publishing_parameters_parent_class = NULL;
 static gpointer publishing_piwigo_piwigo_publisher_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = NULL;
 static gpointer publishing_piwigo_uploader_parent_class = NULL;
 static gpointer publishing_piwigo_ssl_error_pane_parent_class = NULL;
 static gpointer publishing_piwigo_authentication_pane_parent_class = NULL;
@@ -590,7 +606,7 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPub
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
 GType publishing_piwigo_piwigo_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media (SpitPublishingService* base);
-static void piwigo_service_finalize (GObject* obj);
+static void piwigo_service_finalize (GObject * obj);
 #define PUBLISHING_PIWIGO_SERVICE_NAME "Piwigo"
 #define PUBLISHING_PIWIGO_PIWIGO_WS "ws.php"
 #define PUBLISHING_PIWIGO_ORIGINAL_SIZE -1
@@ -611,7 +627,7 @@ PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* nam
 PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment);
 gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self);
 gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other);
-static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj);
+static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj);
 gpointer publishing_piwigo_permission_level_ref (gpointer instance);
 void publishing_piwigo_permission_level_unref (gpointer instance);
 GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -624,7 +640,7 @@ enum  {
 };
 PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name);
 PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name);
-static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel* obj);
+static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj);
 gpointer publishing_piwigo_size_entry_ref (gpointer instance);
 void publishing_piwigo_size_entry_unref (gpointer instance);
 GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -637,7 +653,7 @@ enum  {
 };
 PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name);
 PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name);
-static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* obj);
+static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj);
 gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance);
 void publishing_piwigo_publishing_parameters_unref (gpointer instance);
 GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -650,7 +666,7 @@ enum  {
 };
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void);
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type);
-static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters* obj);
+static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj);
 GType publishing_piwigo_session_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisherPrivate))
 enum  {
@@ -737,7 +753,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
 static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _vala_array_add35 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value);
+static void _vala_array_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value);
 static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self);
 GType publishing_piwigo_publishing_options_pane_get_type (void) G_GNUC_CONST;
 PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled);
@@ -778,7 +794,7 @@ static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self);
 static void _vala_SoupCookie_free (SoupCookie* self);
 static void __vala_SoupCookie_free0_ (gpointer var);
 static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self);
-static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj);
+static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj);
 #define PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploaderPrivate))
 enum  {
 	PUBLISHING_PIWIGO_UPLOADER_DUMMY_PROPERTY
@@ -787,13 +803,13 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable);
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable);
 GType publishing_piwigo_images_add_transaction_get_type (void) G_GNUC_CONST;
-static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 #define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPanePrivate))
 enum  {
 	PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY,
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST,
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT,
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY
 };
 static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base);
 gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self);
@@ -806,14 +822,14 @@ static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value);
 static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value);
 static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value);
-static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj);
+static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj);
 static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPanePrivate))
 enum  {
 	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY,
-	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE,
-	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY,
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY
 };
 static void publishing_piwigo_authentication_pane_real_constructed (GObject* base);
 PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self);
@@ -831,20 +847,20 @@ static void publishing_piwigo_authentication_pane_real_on_pane_installed (Shotwe
 static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value);
 static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value);
 static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_piwigo_authentication_pane_finalize (GObject* obj);
+static void publishing_piwigo_authentication_pane_finalize (GObject * obj);
 static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPanePrivate))
 enum  {
 	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY
 };
 static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length);
 static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
@@ -868,16 +884,16 @@ static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed
 static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
 static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
 static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self);
-static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add40 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add45 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self);
 static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name);
@@ -901,7 +917,7 @@ static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled
 static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value);
 static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value);
 static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj);
+static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj);
 static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSessionPrivate))
@@ -909,7 +925,7 @@ enum  {
 	PUBLISHING_PIWIGO_SESSION_DUMMY_PROPERTY
 };
 static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj);
+static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj);
 enum  {
 	PUBLISHING_PIWIGO_TRANSACTION_DUMMY_PROPERTY
 };
@@ -939,7 +955,7 @@ enum  {
 	PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_DUMMY_PROPERTY
 };
 static void _g_free0_ (gpointer var);
-static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj);
+static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -947,8 +963,8 @@ static gint _vala_array_length (gpointer array);
 
 PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory) {
 	PiwigoService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -959,9 +975,9 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 963 "PiwigoPublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 979 "PiwigoPublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" PIWIGO_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -972,27 +988,27 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 		piwigo_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_piwigo_service_icon_pixbuf_set_size_ = piwigo_service_icon_pixbuf_set_length1;
-#line 976 "PiwigoPublishing.c"
+#line 992 "PiwigoPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 980 "PiwigoPublishing.c"
+#line 996 "PiwigoPublishing.c"
 }
 
 
 PiwigoService* piwigo_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return piwigo_service_construct (TYPE_PIWIGO_SERVICE, resource_directory);
-#line 987 "PiwigoPublishing.c"
+#line 1003 "PiwigoPublishing.c"
 }
 
 
 static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	PiwigoService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1005,7 +1021,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1009 "PiwigoPublishing.c"
+#line 1025 "PiwigoPublishing.c"
 }
 
 
@@ -1018,7 +1034,7 @@ static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.piwigo";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1022 "PiwigoPublishing.c"
+#line 1038 "PiwigoPublishing.c"
 }
 
 
@@ -1031,14 +1047,14 @@ static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Piwigo";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1035 "PiwigoPublishing.c"
+#line 1051 "PiwigoPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1042 "PiwigoPublishing.c"
+#line 1058 "PiwigoPublishing.c"
 }
 
 
@@ -1049,34 +1065,33 @@ static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 1053 "PiwigoPublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 1069 "PiwigoPublishing.c"
+		GdkPixbuf* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result[i] = _tmp0_;
-#line 1059 "PiwigoPublishing.c"
+#line 1075 "PiwigoPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1063 "PiwigoPublishing.c"
+#line 1079 "PiwigoPublishing.c"
 }
 
 
 static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	PiwigoService * 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 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1088,60 +1103,58 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*info).authors = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc.");
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 ((*info).translators);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 ((*info).version);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 ((*info).license);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = piwigo_service_icon_pixbuf_set;
+	_tmp7_ = piwigo_service_icon_pixbuf_set;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8__length1 = piwigo_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup10 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 1145 "PiwigoPublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 1158 "PiwigoPublishing.c"
 }
 
 
@@ -1149,15 +1162,15 @@ static void piwigo_service_real_activation (SpitPluggable* base, gboolean enable
 	PiwigoService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
-#line 1153 "PiwigoPublishing.c"
+#line 1166 "PiwigoPublishing.c"
 }
 
 
 static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	PiwigoService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingPiwigoPiwigoPublisher* _tmp1_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1170,7 +1183,7 @@ static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1174 "PiwigoPublishing.c"
+#line 1187 "PiwigoPublishing.c"
 }
 
 
@@ -1183,7 +1196,7 @@ static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1187 "PiwigoPublishing.c"
+#line 1200 "PiwigoPublishing.c"
 }
 
 
@@ -1192,7 +1205,7 @@ static void piwigo_service_class_init (PiwigoServiceClass * klass) {
 	piwigo_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = piwigo_service_finalize;
-#line 1196 "PiwigoPublishing.c"
+#line 1209 "PiwigoPublishing.c"
 }
 
 
@@ -1200,16 +1213,16 @@ static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * i
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	piwigo_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) piwigo_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) piwigo_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) piwigo_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) piwigo_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) piwigo_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) piwigo_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) piwigo_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) piwigo_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) piwigo_service_real_activation;
-#line 1213 "PiwigoPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) piwigo_service_real_activation;
+#line 1226 "PiwigoPublishing.c"
 }
 
 
@@ -1217,10 +1230,10 @@ static void piwigo_service_spit_publishing_service_interface_init (SpitPublishin
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	piwigo_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher;
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) piwigo_service_real_get_supported_media;
-#line 1224 "PiwigoPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) piwigo_service_real_get_supported_media;
+#line 1237 "PiwigoPublishing.c"
 }
 
 
@@ -1228,13 +1241,13 @@ static void piwigo_service_instance_init (PiwigoService * self) {
 }
 
 
-static void piwigo_service_finalize (GObject* obj) {
+static void piwigo_service_finalize (GObject * obj) {
 	PiwigoService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (piwigo_service_parent_class)->finalize (obj);
-#line 1238 "PiwigoPublishing.c"
+#line 1251 "PiwigoPublishing.c"
 }
 
 
@@ -1256,13 +1269,13 @@ GType piwigo_service_get_type (void) {
 
 PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type, gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
 	PublishingPiwigoCategory* 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;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1299,25 +1312,25 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
 	self->comment = _tmp6_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1303 "PiwigoPublishing.c"
+#line 1316 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct (PUBLISHING_PIWIGO_TYPE_CATEGORY, id, name, uppercats, comment);
-#line 1310 "PiwigoPublishing.c"
+#line 1323 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment) {
 	PublishingPiwigoCategory* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1350,20 +1363,20 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType obje
 	self->comment = _tmp5_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1354 "PiwigoPublishing.c"
+#line 1367 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment) {
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct_local (PUBLISHING_PIWIGO_TYPE_CATEGORY, name, parent_id, comment);
-#line 1361 "PiwigoPublishing.c"
+#line 1374 "PiwigoPublishing.c"
 }
 
 
 gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (self), FALSE);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1372,16 +1385,16 @@ gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
 	result = _tmp0_ == PUBLISHING_PIWIGO_CATEGORY_NO_ID;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1376 "PiwigoPublishing.c"
+#line 1389 "PiwigoPublishing.c"
 }
 
 
 gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other) {
 	gboolean result = FALSE;
-	PublishingPiwigoCategory* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	PublishingPiwigoCategory* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	PublishingPiwigoCategory* _tmp0_;
+	gint _tmp1_;
+	PublishingPiwigoCategory* _tmp2_;
+	gint _tmp3_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (_self_), FALSE);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1398,14 +1411,14 @@ gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, Pub
 	result = _tmp1_ == _tmp3_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1402 "PiwigoPublishing.c"
+#line 1415 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_category_init (GValue* value) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1409 "PiwigoPublishing.c"
+#line 1422 "PiwigoPublishing.c"
 }
 
 
@@ -1414,7 +1427,7 @@ static void publishing_piwigo_value_category_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (value->data[0].v_pointer);
-#line 1418 "PiwigoPublishing.c"
+#line 1431 "PiwigoPublishing.c"
 	}
 }
 
@@ -1424,11 +1437,11 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_category_ref (src_value->data[0].v_pointer);
-#line 1428 "PiwigoPublishing.c"
+#line 1441 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1432 "PiwigoPublishing.c"
+#line 1445 "PiwigoPublishing.c"
 	}
 }
 
@@ -1436,66 +1449,66 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
 static gpointer publishing_piwigo_value_category_peek_pointer (const GValue* value) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1440 "PiwigoPublishing.c"
+#line 1453 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_category_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1447 "PiwigoPublishing.c"
-		PublishingPiwigoCategory* object;
+#line 1460 "PiwigoPublishing.c"
+		PublishingPiwigoCategory * object;
 		object = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1454 "PiwigoPublishing.c"
+#line 1467 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1458 "PiwigoPublishing.c"
+#line 1471 "PiwigoPublishing.c"
 		}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_category_ref (object);
-#line 1462 "PiwigoPublishing.c"
+#line 1475 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1466 "PiwigoPublishing.c"
+#line 1479 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1470 "PiwigoPublishing.c"
+#line 1483 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_category_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingPiwigoCategory** object_p;
+	PublishingPiwigoCategory ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1481 "PiwigoPublishing.c"
+#line 1494 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1487 "PiwigoPublishing.c"
+#line 1500 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1491 "PiwigoPublishing.c"
+#line 1504 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1495 "PiwigoPublishing.c"
+#line 1508 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1499 "PiwigoPublishing.c"
+#line 1512 "PiwigoPublishing.c"
 }
 
 
@@ -1509,7 +1522,7 @@ GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1513 "PiwigoPublishing.c"
+#line 1526 "PiwigoPublishing.c"
 }
 
 
@@ -1518,12 +1531,12 @@ gpointer publishing_piwigo_value_get_category (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1522 "PiwigoPublishing.c"
+#line 1535 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
-	PublishingPiwigoCategory* old;
+	PublishingPiwigoCategory * old;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY));
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1538,23 +1551,23 @@ void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1542 "PiwigoPublishing.c"
+#line 1555 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1546 "PiwigoPublishing.c"
+#line 1559 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1552 "PiwigoPublishing.c"
+#line 1565 "PiwigoPublishing.c"
 	}
 }
 
 
 void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
-	PublishingPiwigoCategory* old;
+	PublishingPiwigoCategory * old;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY));
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1567,17 +1580,17 @@ void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1571 "PiwigoPublishing.c"
+#line 1584 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1575 "PiwigoPublishing.c"
+#line 1588 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1581 "PiwigoPublishing.c"
+#line 1594 "PiwigoPublishing.c"
 	}
 }
 
@@ -1587,18 +1600,18 @@ static void publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass
 	publishing_piwigo_category_parent_class = g_type_class_peek_parent (klass);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoCategoryClass *) klass)->finalize = publishing_piwigo_category_finalize;
-#line 1591 "PiwigoPublishing.c"
+#line 1604 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1598 "PiwigoPublishing.c"
+#line 1611 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj) {
+static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj) {
 	PublishingPiwigoCategory * self;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_CATEGORY, PublishingPiwigoCategory);
@@ -1612,7 +1625,7 @@ static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj)
 	_g_free0 (self->display_name);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->uppercats);
-#line 1616 "PiwigoPublishing.c"
+#line 1629 "PiwigoPublishing.c"
 }
 
 
@@ -1631,18 +1644,18 @@ GType publishing_piwigo_category_get_type (void) {
 
 
 gpointer publishing_piwigo_category_ref (gpointer instance) {
-	PublishingPiwigoCategory* self;
+	PublishingPiwigoCategory * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1641 "PiwigoPublishing.c"
+#line 1654 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_category_unref (gpointer instance) {
-	PublishingPiwigoCategory* self;
+	PublishingPiwigoCategory * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1650,16 +1663,16 @@ void publishing_piwigo_category_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_CATEGORY_GET_CLASS (self)->finalize (self);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1654 "PiwigoPublishing.c"
+#line 1667 "PiwigoPublishing.c"
 	}
 }
 
 
 PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name) {
 	PublishingPiwigoPermissionLevel* self = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1678,21 +1691,21 @@ PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (G
 	self->name = _tmp2_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1682 "PiwigoPublishing.c"
+#line 1695 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name) {
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_permission_level_construct (PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, id, name);
-#line 1689 "PiwigoPublishing.c"
+#line 1702 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_permission_level_init (GValue* value) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1696 "PiwigoPublishing.c"
+#line 1709 "PiwigoPublishing.c"
 }
 
 
@@ -1701,7 +1714,7 @@ static void publishing_piwigo_value_permission_level_free_value (GValue* value)
 	if (value->data[0].v_pointer) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (value->data[0].v_pointer);
-#line 1705 "PiwigoPublishing.c"
+#line 1718 "PiwigoPublishing.c"
 	}
 }
 
@@ -1711,11 +1724,11 @@ static void publishing_piwigo_value_permission_level_copy_value (const GValue* s
 	if (src_value->data[0].v_pointer) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_permission_level_ref (src_value->data[0].v_pointer);
-#line 1715 "PiwigoPublishing.c"
+#line 1728 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1719 "PiwigoPublishing.c"
+#line 1732 "PiwigoPublishing.c"
 	}
 }
 
@@ -1723,66 +1736,66 @@ static void publishing_piwigo_value_permission_level_copy_value (const GValue* s
 static gpointer publishing_piwigo_value_permission_level_peek_pointer (const GValue* value) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1727 "PiwigoPublishing.c"
+#line 1740 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_permission_level_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1734 "PiwigoPublishing.c"
-		PublishingPiwigoPermissionLevel* object;
+#line 1747 "PiwigoPublishing.c"
+		PublishingPiwigoPermissionLevel * object;
 		object = collect_values[0].v_pointer;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1741 "PiwigoPublishing.c"
+#line 1754 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1745 "PiwigoPublishing.c"
+#line 1758 "PiwigoPublishing.c"
 		}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_permission_level_ref (object);
-#line 1749 "PiwigoPublishing.c"
+#line 1762 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1753 "PiwigoPublishing.c"
+#line 1766 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1757 "PiwigoPublishing.c"
+#line 1770 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_permission_level_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingPiwigoPermissionLevel** object_p;
+	PublishingPiwigoPermissionLevel ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1768 "PiwigoPublishing.c"
+#line 1781 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1774 "PiwigoPublishing.c"
+#line 1787 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1778 "PiwigoPublishing.c"
+#line 1791 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1782 "PiwigoPublishing.c"
+#line 1795 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1786 "PiwigoPublishing.c"
+#line 1799 "PiwigoPublishing.c"
 }
 
 
@@ -1796,7 +1809,7 @@ GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1800 "PiwigoPublishing.c"
+#line 1813 "PiwigoPublishing.c"
 }
 
 
@@ -1805,12 +1818,12 @@ gpointer publishing_piwigo_value_get_permission_level (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1809 "PiwigoPublishing.c"
+#line 1822 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object) {
-	PublishingPiwigoPermissionLevel* old;
+	PublishingPiwigoPermissionLevel * old;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1825,23 +1838,23 @@ void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_obj
 		value->data[0].v_pointer = v_object;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1829 "PiwigoPublishing.c"
+#line 1842 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1833 "PiwigoPublishing.c"
+#line 1846 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1839 "PiwigoPublishing.c"
+#line 1852 "PiwigoPublishing.c"
 	}
 }
 
 
 void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object) {
-	PublishingPiwigoPermissionLevel* old;
+	PublishingPiwigoPermissionLevel * old;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1854,17 +1867,17 @@ void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_ob
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1858 "PiwigoPublishing.c"
+#line 1871 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1862 "PiwigoPublishing.c"
+#line 1875 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1868 "PiwigoPublishing.c"
+#line 1881 "PiwigoPublishing.c"
 	}
 }
 
@@ -1874,18 +1887,18 @@ static void publishing_piwigo_permission_level_class_init (PublishingPiwigoPermi
 	publishing_piwigo_permission_level_parent_class = g_type_class_peek_parent (klass);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPermissionLevelClass *) klass)->finalize = publishing_piwigo_permission_level_finalize;
-#line 1878 "PiwigoPublishing.c"
+#line 1891 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1885 "PiwigoPublishing.c"
+#line 1898 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel* obj) {
+static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj) {
 	PublishingPiwigoPermissionLevel * self;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, PublishingPiwigoPermissionLevel);
@@ -1893,7 +1906,7 @@ static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermiss
 	g_signal_handlers_destroy (self);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 1897 "PiwigoPublishing.c"
+#line 1910 "PiwigoPublishing.c"
 }
 
 
@@ -1912,18 +1925,18 @@ GType publishing_piwigo_permission_level_get_type (void) {
 
 
 gpointer publishing_piwigo_permission_level_ref (gpointer instance) {
-	PublishingPiwigoPermissionLevel* self;
+	PublishingPiwigoPermissionLevel * self;
 	self = instance;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1922 "PiwigoPublishing.c"
+#line 1935 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_permission_level_unref (gpointer instance) {
-	PublishingPiwigoPermissionLevel* self;
+	PublishingPiwigoPermissionLevel * self;
 	self = instance;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1931,16 +1944,16 @@ void publishing_piwigo_permission_level_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_PERMISSION_LEVEL_GET_CLASS (self)->finalize (self);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1935 "PiwigoPublishing.c"
+#line 1948 "PiwigoPublishing.c"
 	}
 }
 
 
 PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name) {
 	PublishingPiwigoSizeEntry* self = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1959,21 +1972,21 @@ PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_
 	self->name = _tmp2_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1963 "PiwigoPublishing.c"
+#line 1976 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name) {
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_size_entry_construct (PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, id, name);
-#line 1970 "PiwigoPublishing.c"
+#line 1983 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_size_entry_init (GValue* value) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1977 "PiwigoPublishing.c"
+#line 1990 "PiwigoPublishing.c"
 }
 
 
@@ -1982,7 +1995,7 @@ static void publishing_piwigo_value_size_entry_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (value->data[0].v_pointer);
-#line 1986 "PiwigoPublishing.c"
+#line 1999 "PiwigoPublishing.c"
 	}
 }
 
@@ -1992,11 +2005,11 @@ static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_val
 	if (src_value->data[0].v_pointer) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_size_entry_ref (src_value->data[0].v_pointer);
-#line 1996 "PiwigoPublishing.c"
+#line 2009 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2000 "PiwigoPublishing.c"
+#line 2013 "PiwigoPublishing.c"
 	}
 }
 
@@ -2004,66 +2017,66 @@ static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_val
 static gpointer publishing_piwigo_value_size_entry_peek_pointer (const GValue* value) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2008 "PiwigoPublishing.c"
+#line 2021 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2015 "PiwigoPublishing.c"
-		PublishingPiwigoSizeEntry* object;
+#line 2028 "PiwigoPublishing.c"
+		PublishingPiwigoSizeEntry * object;
 		object = collect_values[0].v_pointer;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2022 "PiwigoPublishing.c"
+#line 2035 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2026 "PiwigoPublishing.c"
+#line 2039 "PiwigoPublishing.c"
 		}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_size_entry_ref (object);
-#line 2030 "PiwigoPublishing.c"
+#line 2043 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2034 "PiwigoPublishing.c"
+#line 2047 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2038 "PiwigoPublishing.c"
+#line 2051 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingPiwigoSizeEntry** object_p;
+	PublishingPiwigoSizeEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2049 "PiwigoPublishing.c"
+#line 2062 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 2055 "PiwigoPublishing.c"
+#line 2068 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2059 "PiwigoPublishing.c"
+#line 2072 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2063 "PiwigoPublishing.c"
+#line 2076 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2067 "PiwigoPublishing.c"
+#line 2080 "PiwigoPublishing.c"
 }
 
 
@@ -2077,7 +2090,7 @@ GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2081 "PiwigoPublishing.c"
+#line 2094 "PiwigoPublishing.c"
 }
 
 
@@ -2086,12 +2099,12 @@ gpointer publishing_piwigo_value_get_size_entry (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2090 "PiwigoPublishing.c"
+#line 2103 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
-	PublishingPiwigoSizeEntry* old;
+	PublishingPiwigoSizeEntry * old;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2106,23 +2119,23 @@ void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2110 "PiwigoPublishing.c"
+#line 2123 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2114 "PiwigoPublishing.c"
+#line 2127 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2120 "PiwigoPublishing.c"
+#line 2133 "PiwigoPublishing.c"
 	}
 }
 
 
 void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object) {
-	PublishingPiwigoSizeEntry* old;
+	PublishingPiwigoSizeEntry * old;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2135,17 +2148,17 @@ void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2139 "PiwigoPublishing.c"
+#line 2152 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2143 "PiwigoPublishing.c"
+#line 2156 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2149 "PiwigoPublishing.c"
+#line 2162 "PiwigoPublishing.c"
 	}
 }
 
@@ -2155,18 +2168,18 @@ static void publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryCl
 	publishing_piwigo_size_entry_parent_class = g_type_class_peek_parent (klass);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoSizeEntryClass *) klass)->finalize = publishing_piwigo_size_entry_finalize;
-#line 2159 "PiwigoPublishing.c"
+#line 2172 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2166 "PiwigoPublishing.c"
+#line 2179 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* obj) {
+static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj) {
 	PublishingPiwigoSizeEntry * self;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, PublishingPiwigoSizeEntry);
@@ -2174,7 +2187,7 @@ static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* ob
 	g_signal_handlers_destroy (self);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 2178 "PiwigoPublishing.c"
+#line 2191 "PiwigoPublishing.c"
 }
 
 
@@ -2193,18 +2206,18 @@ GType publishing_piwigo_size_entry_get_type (void) {
 
 
 gpointer publishing_piwigo_size_entry_ref (gpointer instance) {
-	PublishingPiwigoSizeEntry* self;
+	PublishingPiwigoSizeEntry * self;
 	self = instance;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2203 "PiwigoPublishing.c"
+#line 2216 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_size_entry_unref (gpointer instance) {
-	PublishingPiwigoSizeEntry* self;
+	PublishingPiwigoSizeEntry * self;
 	self = instance;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2212,7 +2225,7 @@ void publishing_piwigo_size_entry_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2216 "PiwigoPublishing.c"
+#line 2229 "PiwigoPublishing.c"
 	}
 }
 
@@ -2223,21 +2236,21 @@ PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_co
 	self = (PublishingPiwigoPublishingParameters*) g_type_create_instance (object_type);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2227 "PiwigoPublishing.c"
+#line 2240 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void) {
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_publishing_parameters_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS);
-#line 2234 "PiwigoPublishing.c"
+#line 2247 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_publishing_parameters_init (GValue* value) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2241 "PiwigoPublishing.c"
+#line 2254 "PiwigoPublishing.c"
 }
 
 
@@ -2246,7 +2259,7 @@ static void publishing_piwigo_value_publishing_parameters_free_value (GValue* va
 	if (value->data[0].v_pointer) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (value->data[0].v_pointer);
-#line 2250 "PiwigoPublishing.c"
+#line 2263 "PiwigoPublishing.c"
 	}
 }
 
@@ -2256,11 +2269,11 @@ static void publishing_piwigo_value_publishing_parameters_copy_value (const GVal
 	if (src_value->data[0].v_pointer) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 2260 "PiwigoPublishing.c"
+#line 2273 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2264 "PiwigoPublishing.c"
+#line 2277 "PiwigoPublishing.c"
 	}
 }
 
@@ -2268,66 +2281,66 @@ static void publishing_piwigo_value_publishing_parameters_copy_value (const GVal
 static gpointer publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2272 "PiwigoPublishing.c"
+#line 2285 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2279 "PiwigoPublishing.c"
-		PublishingPiwigoPublishingParameters* object;
+#line 2292 "PiwigoPublishing.c"
+		PublishingPiwigoPublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2286 "PiwigoPublishing.c"
+#line 2299 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2290 "PiwigoPublishing.c"
+#line 2303 "PiwigoPublishing.c"
 		}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (object);
-#line 2294 "PiwigoPublishing.c"
+#line 2307 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2298 "PiwigoPublishing.c"
+#line 2311 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2302 "PiwigoPublishing.c"
+#line 2315 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingPiwigoPublishingParameters** object_p;
+	PublishingPiwigoPublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2313 "PiwigoPublishing.c"
+#line 2326 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 2319 "PiwigoPublishing.c"
+#line 2332 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2323 "PiwigoPublishing.c"
+#line 2336 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2327 "PiwigoPublishing.c"
+#line 2340 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2331 "PiwigoPublishing.c"
+#line 2344 "PiwigoPublishing.c"
 }
 
 
@@ -2341,7 +2354,7 @@ GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* nam
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2345 "PiwigoPublishing.c"
+#line 2358 "PiwigoPublishing.c"
 }
 
 
@@ -2350,12 +2363,12 @@ gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2354 "PiwigoPublishing.c"
+#line 2367 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingPiwigoPublishingParameters* old;
+	PublishingPiwigoPublishingParameters * old;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2370,23 +2383,23 @@ void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer
 		value->data[0].v_pointer = v_object;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2374 "PiwigoPublishing.c"
+#line 2387 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2378 "PiwigoPublishing.c"
+#line 2391 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2384 "PiwigoPublishing.c"
+#line 2397 "PiwigoPublishing.c"
 	}
 }
 
 
 void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingPiwigoPublishingParameters* old;
+	PublishingPiwigoPublishingParameters * old;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2399,17 +2412,17 @@ void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2403 "PiwigoPublishing.c"
+#line 2416 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2407 "PiwigoPublishing.c"
+#line 2420 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2413 "PiwigoPublishing.c"
+#line 2426 "PiwigoPublishing.c"
 	}
 }
 
@@ -2419,7 +2432,7 @@ static void publishing_piwigo_publishing_parameters_class_init (PublishingPiwigo
 	publishing_piwigo_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPublishingParametersClass *) klass)->finalize = publishing_piwigo_publishing_parameters_finalize;
-#line 2423 "PiwigoPublishing.c"
+#line 2436 "PiwigoPublishing.c"
 }
 
 
@@ -2436,11 +2449,11 @@ static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiw
 	self->no_upload_tags = FALSE;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2440 "PiwigoPublishing.c"
+#line 2453 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters* obj) {
+static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj) {
 	PublishingPiwigoPublishingParameters * self;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, PublishingPiwigoPublishingParameters);
@@ -2452,7 +2465,7 @@ static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPu
 	_publishing_piwigo_permission_level_unref0 (self->perm_level);
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_size_entry_unref0 (self->photo_size);
-#line 2456 "PiwigoPublishing.c"
+#line 2469 "PiwigoPublishing.c"
 }
 
 
@@ -2471,18 +2484,18 @@ GType publishing_piwigo_publishing_parameters_get_type (void) {
 
 
 gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance) {
-	PublishingPiwigoPublishingParameters* self;
+	PublishingPiwigoPublishingParameters * self;
 	self = instance;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2481 "PiwigoPublishing.c"
+#line 2494 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
-	PublishingPiwigoPublishingParameters* self;
+	PublishingPiwigoPublishingParameters * self;
 	self = instance;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2490,18 +2503,18 @@ void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2494 "PiwigoPublishing.c"
+#line 2507 "PiwigoPublishing.c"
 	}
 }
 
 
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingPiwigoPiwigoPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	PublishingPiwigoSession* _tmp4_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	PublishingPiwigoSession* _tmp4_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2534,22 +2547,22 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (G
 	self->priv->session = _tmp4_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2538 "PiwigoPublishing.c"
+#line 2551 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_piwigo_publisher_construct (PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, service, host);
-#line 2545 "PiwigoPublishing.c"
+#line 2558 "PiwigoPublishing.c"
 }
 
 
 static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingPiwigoPiwigoPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2560,14 +2573,14 @@ static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_servic
 	result = _tmp1_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2564 "PiwigoPublishing.c"
+#line 2577 "PiwigoPublishing.c"
 }
 
 
 SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (PublishingPiwigoPiwigoPublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2578,14 +2591,14 @@ SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (Publishin
 	result = _tmp1_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2582 "PiwigoPublishing.c"
+#line 2595 "PiwigoPublishing.c"
 }
 
 
 static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingPiwigoPiwigoPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2594,15 +2607,15 @@ static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2598 "PiwigoPublishing.c"
+#line 2611 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingPiwigoPiwigoPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	PublishingPiwigoSession* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	PublishingPiwigoSession* _tmp1_;
+	gboolean _tmp2_;
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
 #line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2611,7 +2624,7 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 2615 "PiwigoPublishing.c"
+#line 2628 "PiwigoPublishing.c"
 	}
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:161: PiwigoPublisher: starting interaction.");
@@ -2627,17 +2640,17 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		g_debug ("PiwigoPublishing.vala:166: PiwigoPublisher: session is authenticated.");
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 2631 "PiwigoPublishing.c"
+#line 2644 "PiwigoPublishing.c"
 	} else {
 		gchar* persistent_url = NULL;
-		gchar* _tmp3_ = NULL;
+		gchar* _tmp3_;
 		gchar* persistent_username = NULL;
-		gchar* _tmp4_ = NULL;
+		gchar* _tmp4_;
 		gchar* persistent_password = NULL;
-		gchar* _tmp5_ = NULL;
+		gchar* _tmp5_;
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
-		const gchar* _tmp8_ = NULL;
+		const gchar* _tmp8_;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:169: PiwigoPublisher: session is not authenticat" \
 "ed.");
@@ -2657,39 +2670,39 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		_tmp8_ = persistent_url;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp8_ != NULL) {
-#line 2660 "PiwigoPublishing.c"
-			const gchar* _tmp9_ = NULL;
+#line 2673 "PiwigoPublishing.c"
+			const gchar* _tmp9_;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = persistent_username;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = _tmp9_ != NULL;
-#line 2666 "PiwigoPublishing.c"
+#line 2679 "PiwigoPublishing.c"
 		} else {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = FALSE;
-#line 2670 "PiwigoPublishing.c"
+#line 2683 "PiwigoPublishing.c"
 		}
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp7_) {
-#line 2674 "PiwigoPublishing.c"
-			const gchar* _tmp10_ = NULL;
+#line 2687 "PiwigoPublishing.c"
+			const gchar* _tmp10_;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = persistent_password;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = _tmp10_ != NULL;
-#line 2680 "PiwigoPublishing.c"
+#line 2693 "PiwigoPublishing.c"
 		} else {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = FALSE;
-#line 2684 "PiwigoPublishing.c"
+#line 2697 "PiwigoPublishing.c"
 		}
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp6_) {
-#line 2688 "PiwigoPublishing.c"
-			const gchar* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+#line 2701 "PiwigoPublishing.c"
+			const gchar* _tmp11_;
+			const gchar* _tmp12_;
+			const gchar* _tmp13_;
+			gboolean _tmp14_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = persistent_url;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2700,11 +2713,11 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 			_tmp14_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 2703 "PiwigoPublishing.c"
+#line 2716 "PiwigoPublishing.c"
 		} else {
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 2707 "PiwigoPublishing.c"
+#line 2720 "PiwigoPublishing.c"
 		}
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_password);
@@ -2712,7 +2725,7 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		_g_free0 (persistent_username);
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_url);
-#line 2715 "PiwigoPublishing.c"
+#line 2728 "PiwigoPublishing.c"
 	}
 }
 
@@ -2723,14 +2736,14 @@ static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublishe
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->running = FALSE;
-#line 2726 "PiwigoPublishing.c"
+#line 2739 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2741,13 +2754,13 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPi
 	result = _tmp1_;
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2744 "PiwigoPublishing.c"
+#line 2757 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2758,14 +2771,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiw
 	_tmp1_ = url;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 2761 "PiwigoPublishing.c"
+#line 2774 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2776,13 +2789,13 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiw
 	result = _tmp1_;
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2779 "PiwigoPublishing.c"
+#line 2792 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2793,14 +2806,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_username (Publishi
 	_tmp1_ = username;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 2796 "PiwigoPublishing.c"
+#line 2809 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2811,13 +2824,13 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiw
 	result = _tmp1_;
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2814 "PiwigoPublishing.c"
+#line 2827 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2826,14 +2839,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_password (Publishi
 	_tmp1_ = password;
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", _tmp1_);
-#line 2829 "PiwigoPublishing.c"
+#line 2842 "PiwigoPublishing.c"
 }
 
 
 gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2844,13 +2857,13 @@ gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiw
 	result = _tmp1_;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2847 "PiwigoPublishing.c"
+#line 2860 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2859,14 +2872,14 @@ static void publishing_piwigo_piwigo_publisher_set_remember_password (Publishing
 	_tmp1_ = remember_password;
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", _tmp1_);
-#line 2862 "PiwigoPublishing.c"
+#line 2875 "PiwigoPublishing.c"
 }
 
 
 gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2877,13 +2890,13 @@ gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwig
 	result = _tmp1_;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2880 "PiwigoPublishing.c"
+#line 2893 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2892,14 +2905,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwi
 	_tmp1_ = last_category;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", _tmp1_);
-#line 2895 "PiwigoPublishing.c"
+#line 2908 "PiwigoPublishing.c"
 }
 
 
 gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2910,13 +2923,13 @@ gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiw
 	result = _tmp1_;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2913 "PiwigoPublishing.c"
+#line 2926 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2925,14 +2938,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_permission_level (Publis
 	_tmp1_ = last_permission_level;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", _tmp1_);
-#line 2928 "PiwigoPublishing.c"
+#line 2941 "PiwigoPublishing.c"
 }
 
 
 gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2943,13 +2956,13 @@ gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiw
 	result = _tmp1_;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2946 "PiwigoPublishing.c"
+#line 2959 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2958,14 +2971,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPi
 	_tmp1_ = last_photo_size;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", _tmp1_);
-#line 2961 "PiwigoPublishing.c"
+#line 2974 "PiwigoPublishing.c"
 }
 
 
 static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2976,13 +2989,13 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (Pu
 	result = _tmp1_;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2979 "PiwigoPublishing.c"
+#line 2992 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2991,14 +3004,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (Publis
 	_tmp1_ = title_as_comment;
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", _tmp1_);
-#line 2994 "PiwigoPublishing.c"
+#line 3007 "PiwigoPublishing.c"
 }
 
 
 static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3009,13 +3022,13 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (Publ
 	result = _tmp1_;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3012 "PiwigoPublishing.c"
+#line 3025 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3024,14 +3037,14 @@ static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (Publishi
 	_tmp1_ = no_upload_tags;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", _tmp1_);
-#line 3027 "PiwigoPublishing.c"
+#line 3040 "PiwigoPublishing.c"
 }
 
 
 static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self) {
 	gboolean result = FALSE;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3042,13 +3055,13 @@ static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (
 	result = _tmp1_;
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3045 "PiwigoPublishing.c"
+#line 3058 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	gboolean _tmp1_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3057,7 +3070,7 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
 	_tmp1_ = strip_metadata;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 3060 "PiwigoPublishing.c"
+#line 3073 "PiwigoPublishing.c"
 }
 
 
@@ -3075,19 +3088,19 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
 static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked ((PublishingPiwigoPiwigoPublisher*) self, url, user, password, remember_password);
-#line 3078 "PiwigoPublishing.c"
+#line 3091 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoAuthenticationPaneMode mode) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingPiwigoAuthenticationPane* authentication_pane = NULL;
-	PublishingPiwigoAuthenticationPaneMode _tmp1_ = 0;
-	PublishingPiwigoAuthenticationPane* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
+	PublishingPiwigoAuthenticationPaneMode _tmp1_;
+	PublishingPiwigoAuthenticationPane* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkWidget* _tmp6_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3120,22 +3133,22 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
 	_g_object_unref0 (_tmp6_);
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 3123 "PiwigoPublishing.c"
+#line 3136 "PiwigoPublishing.c"
 }
 
 
 static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	PublishingPiwigoSession* _tmp1_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	PublishingPiwigoSession* _tmp1_;
 	gchar* persistent_url = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp2_;
 	gchar* persistent_username = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	gchar* persistent_password = NULL;
-	gchar* _tmp4_ = NULL;
+	gchar* _tmp4_;
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
-	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp7_;
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:297: SSL: User wants us to retry with broken cer" \
 "tificate");
@@ -3165,39 +3178,39 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 	_tmp7_ = persistent_url;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 3167 "PiwigoPublishing.c"
-		const gchar* _tmp8_ = NULL;
+#line 3180 "PiwigoPublishing.c"
+		const gchar* _tmp8_;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = persistent_username;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _tmp8_ != NULL;
-#line 3173 "PiwigoPublishing.c"
+#line 3186 "PiwigoPublishing.c"
 	} else {
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = FALSE;
-#line 3177 "PiwigoPublishing.c"
+#line 3190 "PiwigoPublishing.c"
 	}
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 3181 "PiwigoPublishing.c"
-		const gchar* _tmp9_ = NULL;
+#line 3194 "PiwigoPublishing.c"
+		const gchar* _tmp9_;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = persistent_password;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = _tmp9_ != NULL;
-#line 3187 "PiwigoPublishing.c"
+#line 3200 "PiwigoPublishing.c"
 	} else {
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = FALSE;
-#line 3191 "PiwigoPublishing.c"
+#line 3204 "PiwigoPublishing.c"
 	}
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 3195 "PiwigoPublishing.c"
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gboolean _tmp13_ = FALSE;
+#line 3208 "PiwigoPublishing.c"
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		const gchar* _tmp12_;
+		gboolean _tmp13_;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = persistent_url;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3208,11 +3221,11 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 		_tmp13_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, _tmp13_);
-#line 3210 "PiwigoPublishing.c"
+#line 3223 "PiwigoPublishing.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3214 "PiwigoPublishing.c"
+#line 3227 "PiwigoPublishing.c"
 	}
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_password);
@@ -3220,37 +3233,37 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 	_g_free0 (persistent_username);
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_url);
-#line 3222 "PiwigoPublishing.c"
+#line 3235 "PiwigoPublishing.c"
 }
 
 
 static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__lambda7_ ((PublishingPiwigoPiwigoPublisher*) self);
-#line 3229 "PiwigoPublishing.c"
+#line 3242 "PiwigoPublishing.c"
 }
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 3236 "PiwigoPublishing.c"
+#line 3249 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url) {
 	SoupURI* uri = NULL;
-	const gchar* _tmp0_ = NULL;
-	SoupURI* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	SoupURI* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
 	PublishingPiwigoSSLErrorPane* ssl_pane = NULL;
-	PublishingPiwigoSessionLoginTransaction* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PublishingPiwigoSSLErrorPane* _tmp5_ = NULL;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
+	PublishingPiwigoSessionLoginTransaction* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingPiwigoSSLErrorPane* _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkWidget* _tmp9_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3295,7 +3308,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
 	_g_object_unref0 (ssl_pane);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__vala_SoupURI_free0 (uri);
-#line 3297 "PiwigoPublishing.c"
+#line 3310 "PiwigoPublishing.c"
 }
 
 
@@ -3311,11 +3324,11 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
      * @param password the password of the Piwigo as entered in the dialog
      */
 static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3332,7 +3345,7 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
 	if (!_tmp0_) {
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3334 "PiwigoPublishing.c"
+#line 3347 "PiwigoPublishing.c"
 	}
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
@@ -3344,7 +3357,7 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
 	_tmp4_ = remember_password;
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 3346 "PiwigoPublishing.c"
+#line 3359 "PiwigoPublishing.c"
 }
 
 
@@ -3362,31 +3375,31 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
 static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3364 "PiwigoPublishing.c"
+#line 3377 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3371 "PiwigoPublishing.c"
+#line 3384 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	PublishingPiwigoSessionLoginTransaction* login_trans = NULL;
-	PublishingPiwigoSession* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	PublishingPiwigoSessionLoginTransaction* _tmp11_ = NULL;
-	PublishingPiwigoSessionLoginTransaction* _tmp12_ = NULL;
+	PublishingPiwigoSession* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_;
+	PublishingPiwigoSessionLoginTransaction* _tmp11_;
+	PublishingPiwigoSessionLoginTransaction* _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -3414,17 +3427,17 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 	_tmp3_ = remember_password;
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp3_) {
-#line 3416 "PiwigoPublishing.c"
-		const gchar* _tmp4_ = NULL;
+#line 3429 "PiwigoPublishing.c"
+		const gchar* _tmp4_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = password;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_set_persistent_password (self, _tmp4_);
-#line 3422 "PiwigoPublishing.c"
+#line 3435 "PiwigoPublishing.c"
 	} else {
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_set_persistent_password (self, NULL);
-#line 3426 "PiwigoPublishing.c"
+#line 3439 "PiwigoPublishing.c"
 	}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->session;
@@ -3450,7 +3463,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3452 "PiwigoPublishing.c"
+#line 3465 "PiwigoPublishing.c"
 	{
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3458,7 +3471,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3460 "PiwigoPublishing.c"
+#line 3473 "PiwigoPublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3469,14 +3482,14 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 			g_clear_error (&_inner_error_);
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3471 "PiwigoPublishing.c"
+#line 3484 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally23;
 	__catch23_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp13_ = NULL;
+		GError* _tmp13_;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3485,28 +3498,28 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		_tmp13_ = err;
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_error_matches (_tmp13_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 3487 "PiwigoPublishing.c"
-			const gchar* _tmp14_ = NULL;
+#line 3500 "PiwigoPublishing.c"
+			const gchar* _tmp14_;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_debug ("PiwigoPublishing.vala:367: ERROR: SSL connection problems");
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = url;
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, _tmp14_);
-#line 3495 "PiwigoPublishing.c"
+#line 3508 "PiwigoPublishing.c"
 		} else {
-			GError* _tmp15_ = NULL;
+			GError* _tmp15_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_debug ("PiwigoPublishing.vala:370: ERROR: do_network_login");
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp15_ = err;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp15_);
-#line 3504 "PiwigoPublishing.c"
+#line 3517 "PiwigoPublishing.c"
 		}
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 3508 "PiwigoPublishing.c"
+#line 3521 "PiwigoPublishing.c"
 	}
 	__finally23:
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3519,24 +3532,24 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		g_clear_error (&_inner_error_);
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3521 "PiwigoPublishing.c"
+#line 3534 "PiwigoPublishing.c"
 	}
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (login_trans);
-#line 3525 "PiwigoPublishing.c"
+#line 3538 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 	gchar* result = NULL;
 	gchar* norm_url = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	const gchar* _tmp11_;
+	gboolean _tmp12_;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3551,20 +3564,20 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 	_tmp3_ = g_str_has_suffix (_tmp2_, ".php");
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp3_) {
-#line 3553 "PiwigoPublishing.c"
-		const gchar* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 3566 "PiwigoPublishing.c"
+		const gchar* _tmp4_;
+		gboolean _tmp5_;
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = norm_url;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = g_str_has_suffix (_tmp4_, "/");
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (!_tmp5_) {
-#line 3564 "PiwigoPublishing.c"
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
+#line 3577 "PiwigoPublishing.c"
+			const gchar* _tmp6_;
+			gchar* _tmp7_;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = norm_url;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3573,7 +3586,7 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 			_g_free0 (norm_url);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			norm_url = _tmp7_;
-#line 3575 "PiwigoPublishing.c"
+#line 3588 "PiwigoPublishing.c"
 		}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = norm_url;
@@ -3583,7 +3596,7 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 		_g_free0 (norm_url);
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		norm_url = _tmp9_;
-#line 3585 "PiwigoPublishing.c"
+#line 3598 "PiwigoPublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = norm_url;
@@ -3591,26 +3604,26 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 	_tmp12_ = g_str_has_prefix (_tmp11_, "http://");
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp12_) {
-#line 3593 "PiwigoPublishing.c"
-		const gchar* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
+#line 3606 "PiwigoPublishing.c"
+		const gchar* _tmp13_;
+		gboolean _tmp14_;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = norm_url;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = g_str_has_prefix (_tmp13_, "https://");
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = !_tmp14_;
-#line 3602 "PiwigoPublishing.c"
+#line 3615 "PiwigoPublishing.c"
 	} else {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = FALSE;
-#line 3606 "PiwigoPublishing.c"
+#line 3619 "PiwigoPublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp10_) {
-#line 3610 "PiwigoPublishing.c"
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+#line 3623 "PiwigoPublishing.c"
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = norm_url;
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3619,13 +3632,13 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 		_g_free0 (norm_url);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		norm_url = _tmp16_;
-#line 3621 "PiwigoPublishing.c"
+#line 3634 "PiwigoPublishing.c"
 	}
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = norm_url;
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3627 "PiwigoPublishing.c"
+#line 3640 "PiwigoPublishing.c"
 }
 
 
@@ -3647,7 +3660,7 @@ static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_suppor
 	result = publishing_piwigo_transaction_validate_xml (doc);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3649 "PiwigoPublishing.c"
+#line 3662 "PiwigoPublishing.c"
 }
 
 
@@ -3656,27 +3669,27 @@ static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_supp
 	result = publishing_piwigo_transaction_get_error_code (doc);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3658 "PiwigoPublishing.c"
+#line 3671 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
 	gchar* endpoint_url = NULL;
-	PublishingRESTSupportTransaction* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
+	PublishingRESTSupportTransaction* _tmp19_;
+	gchar* _tmp20_;
+	const gchar* _tmp21_;
 	gchar* pwg_id = NULL;
-	PublishingRESTSupportTransaction* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	PublishingPiwigoSession* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
+	PublishingRESTSupportTransaction* _tmp22_;
+	gchar* _tmp23_;
+	const gchar* _tmp24_;
+	PublishingPiwigoSession* _tmp25_;
+	const gchar* _tmp26_;
+	const gchar* _tmp27_;
+	const gchar* _tmp28_;
 	GError * _inner_error_ = NULL;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -3696,13 +3709,13 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 3698 "PiwigoPublishing.c"
+#line 3711 "PiwigoPublishing.c"
 	{
-		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_;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = txn;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3721,7 +3734,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3723 "PiwigoPublishing.c"
+#line 3736 "PiwigoPublishing.c"
 				goto __catch24_spit_publishing_publishing_error;
 			}
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3730,7 +3743,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			g_clear_error (&_inner_error_);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3732 "PiwigoPublishing.c"
+#line 3745 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally24;
@@ -3741,13 +3754,13 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		err = _inner_error_;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 3743 "PiwigoPublishing.c"
+#line 3756 "PiwigoPublishing.c"
 		{
-			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_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = txn;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3766,7 +3779,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3768 "PiwigoPublishing.c"
+#line 3781 "PiwigoPublishing.c"
 					goto __catch25_spit_publishing_publishing_error;
 				}
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3777,7 +3790,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 				g_clear_error (&_inner_error_);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3779 "PiwigoPublishing.c"
+#line 3792 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally25;
@@ -3785,10 +3798,10 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		{
 			GError* code = NULL;
 			gint code_int = 0;
-			GError* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
+			GError* _tmp14_;
+			const gchar* _tmp15_;
+			gint _tmp16_;
+			gint _tmp17_;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			code = _inner_error_;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3809,20 +3822,20 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 				g_debug ("PiwigoPublishing.vala:422: ERROR: on_login_network_complete, code 999");
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 3811 "PiwigoPublishing.c"
+#line 3824 "PiwigoPublishing.c"
 			} else {
-				GError* _tmp18_ = NULL;
+				GError* _tmp18_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_debug ("PiwigoPublishing.vala:425: ERROR: on_login_network_complete");
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp18_ = err;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp18_);
-#line 3820 "PiwigoPublishing.c"
+#line 3833 "PiwigoPublishing.c"
 			}
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (code);
-#line 3824 "PiwigoPublishing.c"
+#line 3837 "PiwigoPublishing.c"
 		}
 		__finally25:
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3837,13 +3850,13 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			g_clear_error (&_inner_error_);
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3839 "PiwigoPublishing.c"
+#line 3852 "PiwigoPublishing.c"
 		}
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3845 "PiwigoPublishing.c"
+#line 3858 "PiwigoPublishing.c"
 	}
 	__finally24:
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3854,7 +3867,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		g_clear_error (&_inner_error_);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3856 "PiwigoPublishing.c"
+#line 3869 "PiwigoPublishing.c"
 	}
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = txn;
@@ -3892,7 +3905,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 	_g_free0 (pwg_id);
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (endpoint_url);
-#line 3894 "PiwigoPublishing.c"
+#line 3907 "PiwigoPublishing.c"
 }
 
 
@@ -3908,12 +3921,12 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
      * @param err the received error
      */
 static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingPiwigoSession* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingPiwigoSession* _tmp4_;
+	gboolean _tmp5_;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3940,11 +3953,11 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
 	if (_tmp5_) {
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3942 "PiwigoPublishing.c"
+#line 3955 "PiwigoPublishing.c"
 	}
 #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 3946 "PiwigoPublishing.c"
+#line 3959 "PiwigoPublishing.c"
 }
 
 
@@ -3961,22 +3974,22 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
 static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3963 "PiwigoPublishing.c"
+#line 3976 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3970 "PiwigoPublishing.c"
+#line 3983 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* pwg_id) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingPiwigoSession* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingPiwigoSession* _tmp2_;
+	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4000,14 +4013,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 	_tmp3_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp3_) {
-#line 4002 "PiwigoPublishing.c"
+#line 4015 "PiwigoPublishing.c"
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
-		PublishingPiwigoSession* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp7_ = NULL;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp8_ = NULL;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp9_ = NULL;
+		PublishingPiwigoSession* _tmp4_;
+		const gchar* _tmp5_;
+		const gchar* _tmp6_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp7_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp8_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp9_;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->session;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4026,9 +4039,9 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		_tmp9_ = status_txn;
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4028 "PiwigoPublishing.c"
+#line 4041 "PiwigoPublishing.c"
 		{
-			PublishingPiwigoSessionGetStatusTransaction* _tmp10_ = NULL;
+			PublishingPiwigoSessionGetStatusTransaction* _tmp10_;
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = status_txn;
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4037,7 +4050,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4039 "PiwigoPublishing.c"
+#line 4052 "PiwigoPublishing.c"
 					goto __catch26_spit_publishing_publishing_error;
 				}
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4048,14 +4061,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 				g_clear_error (&_inner_error_);
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4050 "PiwigoPublishing.c"
+#line 4063 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally26;
 		__catch26_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp11_ = NULL;
+			GError* _tmp11_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4069,7 +4082,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp11_);
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 4070 "PiwigoPublishing.c"
+#line 4083 "PiwigoPublishing.c"
 		}
 		__finally26:
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4082,17 +4095,17 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			g_clear_error (&_inner_error_);
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4083 "PiwigoPublishing.c"
+#line 4096 "PiwigoPublishing.c"
 		}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4087 "PiwigoPublishing.c"
+#line 4100 "PiwigoPublishing.c"
 	} else {
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
-		PublishingPiwigoSession* _tmp12_ = NULL;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp13_ = NULL;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp14_ = NULL;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp15_ = NULL;
+		PublishingPiwigoSession* _tmp12_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp13_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp14_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp15_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = self->priv->session;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4107,9 +4120,9 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		_tmp15_ = status_txn;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4108 "PiwigoPublishing.c"
+#line 4121 "PiwigoPublishing.c"
 		{
-			PublishingPiwigoSessionGetStatusTransaction* _tmp16_ = NULL;
+			PublishingPiwigoSessionGetStatusTransaction* _tmp16_;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = status_txn;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4118,7 +4131,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4119 "PiwigoPublishing.c"
+#line 4132 "PiwigoPublishing.c"
 					goto __catch27_spit_publishing_publishing_error;
 				}
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4129,14 +4142,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 				g_clear_error (&_inner_error_);
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4130 "PiwigoPublishing.c"
+#line 4143 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally27;
 		__catch27_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp17_ = NULL;
+			GError* _tmp17_;
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4150,7 +4163,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp17_);
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 4150 "PiwigoPublishing.c"
+#line 4163 "PiwigoPublishing.c"
 		}
 		__finally27:
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4163,11 +4176,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			g_clear_error (&_inner_error_);
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4163 "PiwigoPublishing.c"
+#line 4176 "PiwigoPublishing.c"
 		}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4167 "PiwigoPublishing.c"
+#line 4180 "PiwigoPublishing.c"
 	}
 }
 
@@ -4180,12 +4193,12 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
      * session authentication. It then triggers the fetch categories action.
      */
 static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingPiwigoSession* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingPiwigoSession* _tmp4_;
+	gboolean _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4211,14 +4224,14 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp5_) {
-#line 4211 "PiwigoPublishing.c"
+#line 4224 "PiwigoPublishing.c"
 		gchar* endpoint_url = NULL;
-		PublishingRESTSupportTransaction* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		PublishingRESTSupportTransaction* _tmp6_;
+		gchar* _tmp7_;
 		gchar* pwg_id = NULL;
-		PublishingPiwigoSession* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		PublishingPiwigoSession* _tmp8_;
+		gchar* _tmp9_;
+		const gchar* _tmp10_;
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = txn;
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4235,17 +4248,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 		_tmp10_ = pwg_id;
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp10_);
-#line 4235 "PiwigoPublishing.c"
+#line 4248 "PiwigoPublishing.c"
 		{
 			PublishingRESTSupportXmlDocument* doc = NULL;
-			PublishingRESTSupportTransaction* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			PublishingRESTSupportXmlDocument* _tmp14_ = NULL;
-			PublishingRESTSupportXmlDocument* _tmp15_ = NULL;
+			PublishingRESTSupportTransaction* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			PublishingRESTSupportXmlDocument* _tmp14_;
+			PublishingRESTSupportXmlDocument* _tmp15_;
 			xmlNode* root = NULL;
-			PublishingRESTSupportXmlDocument* _tmp16_ = NULL;
-			xmlNode* _tmp17_ = NULL;
+			PublishingRESTSupportXmlDocument* _tmp16_;
+			xmlNode* _tmp17_;
 			xmlNode* username_node = NULL;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = txn;
@@ -4265,7 +4278,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4265 "PiwigoPublishing.c"
+#line 4278 "PiwigoPublishing.c"
 					goto __catch28_spit_publishing_publishing_error;
 				}
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4278,7 +4291,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				g_clear_error (&_inner_error_);
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4278 "PiwigoPublishing.c"
+#line 4291 "PiwigoPublishing.c"
 			}
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = doc;
@@ -4286,26 +4299,26 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			_tmp17_ = publishing_rest_support_xml_document_get_root_node (_tmp16_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			root = _tmp17_;
-#line 4286 "PiwigoPublishing.c"
+#line 4299 "PiwigoPublishing.c"
 			{
 				xmlNode* _tmp18_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp19_ = NULL;
-				xmlNode* _tmp20_ = NULL;
-				xmlNode* _tmp21_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp19_;
+				xmlNode* _tmp20_;
+				xmlNode* _tmp21_;
 				gchar* username = NULL;
-				xmlNode* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
-				PublishingPiwigoSession* _tmp25_ = NULL;
-				const gchar* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				const gchar* _tmp28_ = NULL;
-				PublishingPiwigoSession* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				PublishingPiwigoSession* _tmp32_ = NULL;
-				gchar* _tmp33_ = NULL;
-				gchar* _tmp34_ = NULL;
+				xmlNode* _tmp22_;
+				gchar* _tmp23_;
+				const gchar* _tmp24_;
+				PublishingPiwigoSession* _tmp25_;
+				const gchar* _tmp26_;
+				const gchar* _tmp27_;
+				const gchar* _tmp28_;
+				PublishingPiwigoSession* _tmp29_;
+				gchar* _tmp30_;
+				gchar* _tmp31_;
+				PublishingPiwigoSession* _tmp32_;
+				gchar* _tmp33_;
+				gchar* _tmp34_;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp19_ = doc;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4318,7 +4331,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4318 "PiwigoPublishing.c"
+#line 4331 "PiwigoPublishing.c"
 						goto __catch29_spit_publishing_publishing_error;
 					}
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4333,7 +4346,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 					g_clear_error (&_inner_error_);
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4333 "PiwigoPublishing.c"
+#line 4346 "PiwigoPublishing.c"
 				}
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				username_node = _tmp18_;
@@ -4381,13 +4394,13 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (username);
-#line 4381 "PiwigoPublishing.c"
+#line 4394 "PiwigoPublishing.c"
 			}
 			goto __finally29;
 			__catch29_spit_publishing_publishing_error:
 			{
 				GError* err2 = NULL;
-				GError* _tmp35_ = NULL;
+				GError* _tmp35_;
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				err2 = _inner_error_;
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4409,7 +4422,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				_g_free0 (endpoint_url);
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4408 "PiwigoPublishing.c"
+#line 4421 "PiwigoPublishing.c"
 			}
 			__finally29:
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4418,7 +4431,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				_publishing_rest_support_xml_document_unref0 (doc);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4417 "PiwigoPublishing.c"
+#line 4430 "PiwigoPublishing.c"
 					goto __catch28_spit_publishing_publishing_error;
 				}
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4433,17 +4446,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				g_clear_error (&_inner_error_);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4432 "PiwigoPublishing.c"
+#line 4445 "PiwigoPublishing.c"
 			}
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 4436 "PiwigoPublishing.c"
+#line 4449 "PiwigoPublishing.c"
 		}
 		goto __finally28;
 		__catch28_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp36_ = NULL;
+			GError* _tmp36_;
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4463,7 +4476,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			_g_free0 (endpoint_url);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4461 "PiwigoPublishing.c"
+#line 4474 "PiwigoPublishing.c"
 		}
 		__finally28:
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4478,17 +4491,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			g_clear_error (&_inner_error_);
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4476 "PiwigoPublishing.c"
+#line 4489 "PiwigoPublishing.c"
 		}
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (pwg_id);
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (endpoint_url);
-#line 4482 "PiwigoPublishing.c"
+#line 4495 "PiwigoPublishing.c"
 	} else {
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 4486 "PiwigoPublishing.c"
+#line 4499 "PiwigoPublishing.c"
 	}
 }
 
@@ -4497,12 +4510,12 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
      * Event triggered when the get session status fails due to a network error.
      */
 static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = 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 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4527,7 +4540,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
 	_tmp5_ = err;
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4525 "PiwigoPublishing.c"
+#line 4538 "PiwigoPublishing.c"
 }
 
 
@@ -4540,23 +4553,23 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 4538 "PiwigoPublishing.c"
+#line 4551 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 4545 "PiwigoPublishing.c"
+#line 4558 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPiwigoPiwigoPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingPiwigoCategoriesGetListTransaction* cat_trans = NULL;
-	PublishingPiwigoSession* _tmp2_ = NULL;
-	PublishingPiwigoCategoriesGetListTransaction* _tmp3_ = NULL;
+	PublishingPiwigoSession* _tmp2_;
+	PublishingPiwigoCategoriesGetListTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4580,7 +4593,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4578 "PiwigoPublishing.c"
+#line 4591 "PiwigoPublishing.c"
 	{
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4588,7 +4601,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4586 "PiwigoPublishing.c"
+#line 4599 "PiwigoPublishing.c"
 				goto __catch30_spit_publishing_publishing_error;
 			}
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4599,14 +4612,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 			g_clear_error (&_inner_error_);
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4597 "PiwigoPublishing.c"
+#line 4610 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally30;
 	__catch30_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4619,7 +4632,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 4617 "PiwigoPublishing.c"
+#line 4630 "PiwigoPublishing.c"
 	}
 	__finally30:
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4632,11 +4645,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		g_clear_error (&_inner_error_);
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 4630 "PiwigoPublishing.c"
+#line 4643 "PiwigoPublishing.c"
 	}
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 4634 "PiwigoPublishing.c"
+#line 4647 "PiwigoPublishing.c"
 }
 
 
@@ -4647,33 +4660,33 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
      * populates the categories list. It then triggers the display of the
      * publishing options pane.
      */
-static void _vala_array_add35 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) {
+static void _vala_array_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value) {
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoCategory*, *array, (*size) + 1);
-#line 4652 "PiwigoPublishing.c"
+#line 4665 "PiwigoPublishing.c"
 	}
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 4658 "PiwigoPublishing.c"
+#line 4671 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	PublishingPiwigoCategory** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	PublishingPiwigoCategory** _tmp7_;
+	gint _tmp7__length1;
 	GError * _inner_error_ = NULL;
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4717,34 +4730,34 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		self->priv->categories_length1 = 0;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4715 "PiwigoPublishing.c"
+#line 4728 "PiwigoPublishing.c"
 	}
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
+		PublishingRESTSupportTransaction* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp11_;
+		PublishingRESTSupportXmlDocument* _tmp12_;
 		xmlNode* root = NULL;
-		PublishingRESTSupportXmlDocument* _tmp13_ = NULL;
-		xmlNode* _tmp14_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp13_;
+		xmlNode* _tmp14_;
 		xmlNode* categories_node = NULL;
-		xmlNode* _tmp15_ = NULL;
-		xmlNode* _tmp16_ = NULL;
+		xmlNode* _tmp15_;
+		xmlNode* _tmp16_;
 		xmlNode* category_node_iter = NULL;
-		xmlNode* _tmp17_ = NULL;
-		xmlNode* _tmp18_ = NULL;
+		xmlNode* _tmp17_;
+		xmlNode* _tmp18_;
 		xmlNode* name_node = NULL;
 		xmlNode* uppercats_node = NULL;
 		gchar* name = NULL;
-		gchar* _tmp19_ = NULL;
+		gchar* _tmp19_;
 		gchar* id_string = NULL;
-		gchar* _tmp20_ = NULL;
+		gchar* _tmp20_;
 		gchar* uppercats = NULL;
-		gchar* _tmp21_ = NULL;
+		gchar* _tmp21_;
 		GeeHashMap* id_map = NULL;
-		GeeHashMap* _tmp22_ = NULL;
+		GeeHashMap* _tmp22_;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = txn;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4763,7 +4776,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4761 "PiwigoPublishing.c"
+#line 4774 "PiwigoPublishing.c"
 				goto __catch31_spit_publishing_publishing_error;
 			}
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4772,7 +4785,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 			g_clear_error (&_inner_error_);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4770 "PiwigoPublishing.c"
+#line 4783 "PiwigoPublishing.c"
 		}
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = doc;
@@ -4808,53 +4821,53 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		_tmp22_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_map = _tmp22_;
-#line 4806 "PiwigoPublishing.c"
+#line 4819 "PiwigoPublishing.c"
 		{
 			gboolean _tmp23_ = FALSE;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp23_ = TRUE;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 4813 "PiwigoPublishing.c"
-				xmlNode* _tmp26_ = NULL;
+#line 4826 "PiwigoPublishing.c"
+				xmlNode* _tmp26_;
 				xmlNode* _tmp27_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp28_ = NULL;
-				xmlNode* _tmp29_ = NULL;
-				xmlNode* _tmp30_ = NULL;
-				xmlNode* _tmp31_ = NULL;
-				gchar* _tmp32_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp28_;
+				xmlNode* _tmp29_;
+				xmlNode* _tmp30_;
+				xmlNode* _tmp31_;
+				gchar* _tmp32_;
 				xmlNode* _tmp33_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp34_ = NULL;
-				xmlNode* _tmp35_ = NULL;
-				xmlNode* _tmp36_ = NULL;
-				xmlNode* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
-				xmlNode* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
-				GeeHashMap* _tmp41_ = NULL;
-				const gchar* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				PublishingPiwigoCategory** _tmp44_ = NULL;
-				gint _tmp44__length1 = 0;
-				PublishingPiwigoCategory** _tmp46_ = NULL;
-				gint _tmp46__length1 = 0;
-				const gchar* _tmp47_ = NULL;
-				gint _tmp48_ = 0;
-				const gchar* _tmp49_ = NULL;
-				const gchar* _tmp50_ = NULL;
-				PublishingPiwigoCategory* _tmp51_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp34_;
+				xmlNode* _tmp35_;
+				xmlNode* _tmp36_;
+				xmlNode* _tmp37_;
+				gchar* _tmp38_;
+				xmlNode* _tmp39_;
+				gchar* _tmp40_;
+				GeeHashMap* _tmp41_;
+				const gchar* _tmp42_;
+				const gchar* _tmp43_;
+				PublishingPiwigoCategory** _tmp44_;
+				gint _tmp44__length1;
+				PublishingPiwigoCategory** _tmp46_;
+				gint _tmp46__length1;
+				const gchar* _tmp47_;
+				gint _tmp48_;
+				const gchar* _tmp49_;
+				const gchar* _tmp50_;
+				PublishingPiwigoCategory* _tmp51_;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp23_) {
-#line 4843 "PiwigoPublishing.c"
-					xmlNode* _tmp24_ = NULL;
-					xmlNode* _tmp25_ = NULL;
+#line 4856 "PiwigoPublishing.c"
+					xmlNode* _tmp24_;
+					xmlNode* _tmp25_;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp24_ = category_node_iter;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp25_ = _tmp24_->next;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					category_node_iter = _tmp25_;
-#line 4852 "PiwigoPublishing.c"
+#line 4865 "PiwigoPublishing.c"
 				}
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp23_ = FALSE;
@@ -4864,7 +4877,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 				if (!(_tmp26_ != NULL)) {
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 4862 "PiwigoPublishing.c"
+#line 4875 "PiwigoPublishing.c"
 				}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp28_ = doc;
@@ -4888,7 +4901,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					_publishing_rest_support_xml_document_unref0 (doc);
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4886 "PiwigoPublishing.c"
+#line 4899 "PiwigoPublishing.c"
 						goto __catch31_spit_publishing_publishing_error;
 					}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4907,7 +4920,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					g_clear_error (&_inner_error_);
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4905 "PiwigoPublishing.c"
+#line 4918 "PiwigoPublishing.c"
 				}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				name_node = _tmp27_;
@@ -4941,7 +4954,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					_publishing_rest_support_xml_document_unref0 (doc);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4939 "PiwigoPublishing.c"
+#line 4952 "PiwigoPublishing.c"
 						goto __catch31_spit_publishing_publishing_error;
 					}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4960,7 +4973,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					g_clear_error (&_inner_error_);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4958 "PiwigoPublishing.c"
+#line 4971 "PiwigoPublishing.c"
 				}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				uppercats_node = _tmp33_;
@@ -4994,8 +5007,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 				_tmp44__length1 = self->priv->categories_length1;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp44_ == NULL) {
-#line 4992 "PiwigoPublishing.c"
-					PublishingPiwigoCategory** _tmp45_ = NULL;
+#line 5005 "PiwigoPublishing.c"
+					PublishingPiwigoCategory** _tmp45_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp45_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5006,7 +5019,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					self->priv->categories_length1 = 0;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->_categories_size_ = self->priv->categories_length1;
-#line 5004 "PiwigoPublishing.c"
+#line 5017 "PiwigoPublishing.c"
 				}
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp46_ = self->priv->categories;
@@ -5024,52 +5037,52 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 				_tmp51_ = publishing_piwigo_category_new (_tmp48_, _tmp49_, _tmp50_, "");
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_vala_array_add35 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
-#line 5022 "PiwigoPublishing.c"
+#line 5035 "PiwigoPublishing.c"
 			}
 		}
 		{
 			gint i = 0;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			i = 0;
-#line 5029 "PiwigoPublishing.c"
+#line 5042 "PiwigoPublishing.c"
 			{
 				gboolean _tmp52_ = FALSE;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp52_ = TRUE;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				while (TRUE) {
-#line 5036 "PiwigoPublishing.c"
-					gint _tmp54_ = 0;
-					PublishingPiwigoCategory** _tmp55_ = NULL;
-					gint _tmp55__length1 = 0;
+#line 5049 "PiwigoPublishing.c"
+					gint _tmp54_;
+					PublishingPiwigoCategory** _tmp55_;
+					gint _tmp55__length1;
 					gchar** upcatids = NULL;
-					PublishingPiwigoCategory** _tmp56_ = NULL;
-					gint _tmp56__length1 = 0;
-					gint _tmp57_ = 0;
-					PublishingPiwigoCategory* _tmp58_ = NULL;
-					const gchar* _tmp59_ = NULL;
-					gchar** _tmp60_ = NULL;
-					gchar** _tmp61_ = NULL;
-					gint upcatids_length1 = 0;
-					gint _upcatids_size_ = 0;
+					PublishingPiwigoCategory** _tmp56_;
+					gint _tmp56__length1;
+					gint _tmp57_;
+					PublishingPiwigoCategory* _tmp58_;
+					const gchar* _tmp59_;
+					gchar** _tmp60_;
+					gchar** _tmp61_;
+					gint upcatids_length1;
+					gint _upcatids_size_;
 					GString* builder = NULL;
-					GString* _tmp62_ = NULL;
-					PublishingPiwigoCategory** _tmp76_ = NULL;
-					gint _tmp76__length1 = 0;
-					gint _tmp77_ = 0;
-					PublishingPiwigoCategory* _tmp78_ = NULL;
-					GString* _tmp79_ = NULL;
-					const gchar* _tmp80_ = NULL;
-					gchar* _tmp81_ = NULL;
+					GString* _tmp62_;
+					PublishingPiwigoCategory** _tmp76_;
+					gint _tmp76__length1;
+					gint _tmp77_;
+					PublishingPiwigoCategory* _tmp78_;
+					GString* _tmp79_;
+					const gchar* _tmp80_;
+					gchar* _tmp81_;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (!_tmp52_) {
-#line 5061 "PiwigoPublishing.c"
-						gint _tmp53_ = 0;
+#line 5074 "PiwigoPublishing.c"
+						gint _tmp53_;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp53_ = i;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						i = _tmp53_ + 1;
-#line 5067 "PiwigoPublishing.c"
+#line 5080 "PiwigoPublishing.c"
 					}
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp52_ = FALSE;
@@ -5083,7 +5096,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					if (!(_tmp54_ < _tmp55__length1)) {
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						break;
-#line 5081 "PiwigoPublishing.c"
+#line 5094 "PiwigoPublishing.c"
 					}
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp56_ = self->priv->categories;
@@ -5107,41 +5120,41 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					_tmp62_ = g_string_new ("");
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					builder = _tmp62_;
-#line 5105 "PiwigoPublishing.c"
+#line 5118 "PiwigoPublishing.c"
 					{
 						gint j = 0;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						j = 0;
-#line 5110 "PiwigoPublishing.c"
+#line 5123 "PiwigoPublishing.c"
 						{
 							gboolean _tmp63_ = FALSE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp63_ = TRUE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							while (TRUE) {
-#line 5117 "PiwigoPublishing.c"
-								gint _tmp65_ = 0;
-								gchar** _tmp66_ = NULL;
-								gint _tmp66__length1 = 0;
-								GString* _tmp67_ = NULL;
-								GString* _tmp68_ = NULL;
-								GeeHashMap* _tmp69_ = NULL;
-								gchar** _tmp70_ = NULL;
-								gint _tmp70__length1 = 0;
-								gint _tmp71_ = 0;
-								const gchar* _tmp72_ = NULL;
-								gpointer _tmp73_ = NULL;
-								gchar* _tmp74_ = NULL;
-								GString* _tmp75_ = NULL;
+#line 5130 "PiwigoPublishing.c"
+								gint _tmp65_;
+								gchar** _tmp66_;
+								gint _tmp66__length1;
+								GString* _tmp67_;
+								GString* _tmp68_;
+								GeeHashMap* _tmp69_;
+								gchar** _tmp70_;
+								gint _tmp70__length1;
+								gint _tmp71_;
+								const gchar* _tmp72_;
+								gpointer _tmp73_;
+								gchar* _tmp74_;
+								GString* _tmp75_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								if (!_tmp63_) {
-#line 5133 "PiwigoPublishing.c"
-									gint _tmp64_ = 0;
+#line 5146 "PiwigoPublishing.c"
+									gint _tmp64_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_tmp64_ = j;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									j = _tmp64_ + 1;
-#line 5139 "PiwigoPublishing.c"
+#line 5152 "PiwigoPublishing.c"
 								}
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp63_ = FALSE;
@@ -5155,7 +5168,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 								if (!(_tmp65_ < _tmp66__length1)) {
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									break;
-#line 5153 "PiwigoPublishing.c"
+#line 5166 "PiwigoPublishing.c"
 								}
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp67_ = builder;
@@ -5185,7 +5198,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 								_tmp75_ = builder;
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								g_string_append (_tmp75_, " ");
-#line 5183 "PiwigoPublishing.c"
+#line 5196 "PiwigoPublishing.c"
 							}
 						}
 					}
@@ -5211,7 +5224,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					_g_string_free0 (builder);
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					upcatids = (_vala_array_free (upcatids, upcatids_length1, (GDestroyNotify) g_free), NULL);
-#line 5209 "PiwigoPublishing.c"
+#line 5222 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -5225,13 +5238,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		_g_free0 (name);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5223 "PiwigoPublishing.c"
+#line 5236 "PiwigoPublishing.c"
 	}
 	goto __finally31;
 	__catch31_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp82_ = NULL;
+		GError* _tmp82_;
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5246,7 +5259,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		_g_error_free0 (err);
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5244 "PiwigoPublishing.c"
+#line 5257 "PiwigoPublishing.c"
 	}
 	__finally31:
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5257,11 +5270,11 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		g_clear_error (&_inner_error_);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5255 "PiwigoPublishing.c"
+#line 5268 "PiwigoPublishing.c"
 	}
 #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (self);
-#line 5259 "PiwigoPublishing.c"
+#line 5272 "PiwigoPublishing.c"
 }
 
 
@@ -5270,12 +5283,12 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
      * network error.
      */
 static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* 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 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5300,7 +5313,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 	_tmp5_ = err;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5298 "PiwigoPublishing.c"
+#line 5311 "PiwigoPublishing.c"
 }
 
 
@@ -5312,33 +5325,33 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self) {
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked ((PublishingPiwigoPiwigoPublisher*) self);
-#line 5310 "PiwigoPublishing.c"
+#line 5323 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self) {
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked ((PublishingPiwigoPiwigoPublisher*) self, parameters, strip_metadata);
-#line 5317 "PiwigoPublishing.c"
+#line 5330 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingPiwigoPublishingOptionsPane* opts_pane = NULL;
-	PublishingPiwigoCategory** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	PublishingPiwigoPublishingOptionsPane* _tmp8_ = NULL;
-	SpitPublishingPluginHost* _tmp9_ = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	GtkWidget* _tmp11_ = NULL;
-	GtkWidget* _tmp12_ = NULL;
+	PublishingPiwigoCategory** _tmp1_;
+	gint _tmp1__length1;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+	PublishingPiwigoPublishingOptionsPane* _tmp8_;
+	SpitPublishingPluginHost* _tmp9_;
+	SpitPublishingPluginHost* _tmp10_;
+	GtkWidget* _tmp11_;
+	GtkWidget* _tmp12_;
 #line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5387,7 +5400,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
 	_g_object_unref0 (_tmp12_);
 #line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 5385 "PiwigoPublishing.c"
+#line 5398 "PiwigoPublishing.c"
 }
 
 
@@ -5397,21 +5410,21 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
 static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5395 "PiwigoPublishing.c"
+#line 5408 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5402 "PiwigoPublishing.c"
+#line 5415 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self) {
 	PublishingPiwigoSessionLogoutTransaction* logout_trans = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	PublishingPiwigoSessionLogoutTransaction* _tmp1_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	PublishingPiwigoSessionLogoutTransaction* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -5428,7 +5441,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5425 "PiwigoPublishing.c"
+#line 5438 "PiwigoPublishing.c"
 	{
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5436,7 +5449,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5433 "PiwigoPublishing.c"
+#line 5446 "PiwigoPublishing.c"
 				goto __catch32_spit_publishing_publishing_error;
 			}
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5447,14 +5460,14 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 			g_clear_error (&_inner_error_);
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5444 "PiwigoPublishing.c"
+#line 5457 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally32;
 	__catch32_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp2_ = NULL;
+		GError* _tmp2_;
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5468,7 +5481,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp2_);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5464 "PiwigoPublishing.c"
+#line 5477 "PiwigoPublishing.c"
 	}
 	__finally32:
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5481,11 +5494,11 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		g_clear_error (&_inner_error_);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5477 "PiwigoPublishing.c"
+#line 5490 "PiwigoPublishing.c"
 	}
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 5481 "PiwigoPublishing.c"
+#line 5494 "PiwigoPublishing.c"
 }
 
 
@@ -5496,11 +5509,11 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
      * pane again.
      */
 static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingPiwigoSession* _tmp4_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingPiwigoSession* _tmp4_;
 #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5525,7 +5538,7 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi
 	publishing_piwigo_session_deauthenticate (_tmp4_);
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 5521 "PiwigoPublishing.c"
+#line 5534 "PiwigoPublishing.c"
 }
 
 
@@ -5533,12 +5546,12 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi
      * Event triggered when the logout action fails due to a network error.
      */
 static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = 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 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5563,7 +5576,7 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
 	_tmp5_ = err;
 #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5559 "PiwigoPublishing.c"
+#line 5572 "PiwigoPublishing.c"
 }
 
 
@@ -5580,17 +5593,17 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
 static gpointer _publishing_piwigo_publishing_parameters_ref0 (gpointer self) {
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_publishing_parameters_ref (self) : NULL;
-#line 5576 "PiwigoPublishing.c"
+#line 5589 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata) {
-	PublishingPiwigoPublishingParameters* _tmp0_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
-	PublishingPiwigoCategory* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	PublishingPiwigoPublishingParameters* _tmp0_;
+	PublishingPiwigoPublishingParameters* _tmp1_;
+	gboolean _tmp2_;
+	PublishingPiwigoPublishingParameters* _tmp3_;
+	PublishingPiwigoCategory* _tmp4_;
+	gboolean _tmp5_;
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5618,23 +5631,23 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
 	_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 5613 "PiwigoPublishing.c"
-		PublishingPiwigoPublishingParameters* _tmp6_ = NULL;
-		PublishingPiwigoCategory* _tmp7_ = NULL;
+#line 5626 "PiwigoPublishing.c"
+		PublishingPiwigoPublishingParameters* _tmp6_;
+		PublishingPiwigoCategory* _tmp7_;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = parameters;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp6_->category;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp7_);
-#line 5622 "PiwigoPublishing.c"
+#line 5635 "PiwigoPublishing.c"
 	} else {
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp8_;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->strip_metadata;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp8_);
-#line 5629 "PiwigoPublishing.c"
+#line 5642 "PiwigoPublishing.c"
 	}
 }
 
@@ -5653,67 +5666,66 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
 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 5664 "PiwigoPublishing.c"
+#line 5677 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5671 "PiwigoPublishing.c"
+#line 5684 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5678 "PiwigoPublishing.c"
+#line 5691 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoCategory* category) {
-	PublishingPiwigoCategory* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingPiwigoCategory* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	PublishingPiwigoCategory* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	PublishingPiwigoCategory* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingPiwigoCategory* _tmp4_;
+	gboolean _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	PublishingPiwigoCategory* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 	PublishingPiwigoCategoriesAddTransaction* creation_trans = NULL;
-	PublishingPiwigoSession* _tmp13_ = NULL;
-	PublishingPiwigoCategory* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	PublishingPiwigoCategory* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	PublishingPiwigoCategory* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	PublishingPiwigoCategoriesAddTransaction* _tmp23_ = NULL;
-	PublishingPiwigoCategoriesAddTransaction* _tmp24_ = NULL;
+	PublishingPiwigoSession* _tmp12_;
+	PublishingPiwigoCategory* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	PublishingPiwigoCategory* _tmp17_;
+	const gchar* _tmp18_;
+	gint _tmp19_;
+	PublishingPiwigoCategory* _tmp20_;
+	const gchar* _tmp21_;
+	PublishingPiwigoCategoriesAddTransaction* _tmp22_;
+	PublishingPiwigoCategoriesAddTransaction* _tmp23_;
 	GError * _inner_error_ = NULL;
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -5744,52 +5756,50 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = self->priv->host;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = _ ("Creating album %s…");
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = category;
+	_tmp8_ = category;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = _tmp9_->name;
+	_tmp9_ = _tmp8_->name;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = g_strdup_printf (_tmp8_, _tmp10_);
+	_tmp10_ = g_strdup_printf (_ ("Creating album %s…"), _tmp9_);
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp12_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp11_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp11_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = self->priv->session;
+	_tmp12_ = self->priv->session;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = category;
+	_tmp13_ = category;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = _tmp14_->name;
+	_tmp14_ = _tmp13_->name;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = string_strip (_tmp15_);
+	_tmp15_ = string_strip (_tmp14_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = _tmp16_;
+	_tmp16_ = _tmp15_;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = category;
+	_tmp17_ = category;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = _tmp18_->uppercats;
+	_tmp18_ = _tmp17_->uppercats;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = atoi (_tmp19_);
+	_tmp19_ = atoi (_tmp18_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = category;
+	_tmp20_ = category;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = _tmp21_->comment;
+	_tmp21_ = _tmp20_->comment;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp23_ = publishing_piwigo_categories_add_transaction_new (_tmp13_, _tmp17_, _tmp20_, _tmp22_);
+	_tmp22_ = publishing_piwigo_categories_add_transaction_new (_tmp12_, _tmp16_, _tmp19_, _tmp21_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp24_ = _tmp23_;
+	_tmp23_ = _tmp22_;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp17_);
+	_g_free0 (_tmp16_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	creation_trans = _tmp24_;
+	creation_trans = _tmp23_;
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5784 "PiwigoPublishing.c"
+#line 5794 "PiwigoPublishing.c"
 	{
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5797,7 +5807,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5792 "PiwigoPublishing.c"
+#line 5802 "PiwigoPublishing.c"
 				goto __catch33_spit_publishing_publishing_error;
 			}
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5808,14 +5818,14 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 			g_clear_error (&_inner_error_);
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5803 "PiwigoPublishing.c"
+#line 5813 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally33;
 	__catch33_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp25_ = NULL;
+		GError* _tmp24_;
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5823,12 +5833,12 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:783: ERROR: do_create_category");
 #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp25_ = err;
+		_tmp24_ = err;
 #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp25_);
+		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp24_);
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5823 "PiwigoPublishing.c"
+#line 5833 "PiwigoPublishing.c"
 	}
 	__finally33:
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5841,11 +5851,11 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 		g_clear_error (&_inner_error_);
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5836 "PiwigoPublishing.c"
+#line 5846 "PiwigoPublishing.c"
 	}
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 5840 "PiwigoPublishing.c"
+#line 5850 "PiwigoPublishing.c"
 }
 
 
@@ -5857,10 +5867,10 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
      * the publishing parameters. It then calls the upload action.
      */
 static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -5880,32 +5890,32 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
 #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 5875 "PiwigoPublishing.c"
+#line 5885 "PiwigoPublishing.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* rsp = NULL;
-		PublishingRESTSupportXmlDocument* _tmp9_ = NULL;
-		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp9_;
+		xmlNode* _tmp10_;
 		xmlNode* id_node = NULL;
 		xmlNode* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
-		xmlNode* _tmp14_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
+		xmlNode* _tmp14_;
 		gchar* id_string = NULL;
-		xmlNode* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
+		xmlNode* _tmp15_;
+		gchar* _tmp16_;
 		gint id = 0;
-		const gchar* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		PublishingPiwigoPublishingParameters* _tmp19_ = NULL;
-		PublishingPiwigoCategory* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		gboolean _tmp22_ = FALSE;
+		const gchar* _tmp17_;
+		gint _tmp18_;
+		PublishingPiwigoPublishingParameters* _tmp19_;
+		PublishingPiwigoCategory* _tmp20_;
+		gint _tmp21_;
+		gboolean _tmp22_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = txn;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5924,7 +5934,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5919 "PiwigoPublishing.c"
+#line 5929 "PiwigoPublishing.c"
 				goto __catch34_spit_publishing_publishing_error;
 			}
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5933,7 +5943,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 			g_clear_error (&_inner_error_);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5928 "PiwigoPublishing.c"
+#line 5938 "PiwigoPublishing.c"
 		}
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = doc;
@@ -5955,7 +5965,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5950 "PiwigoPublishing.c"
+#line 5960 "PiwigoPublishing.c"
 				goto __catch34_spit_publishing_publishing_error;
 			}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5966,7 +5976,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 			g_clear_error (&_inner_error_);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5961 "PiwigoPublishing.c"
+#line 5971 "PiwigoPublishing.c"
 		}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_node = _tmp11_;
@@ -5998,13 +6008,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		_g_free0 (id_string);
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5993 "PiwigoPublishing.c"
+#line 6003 "PiwigoPublishing.c"
 	}
 	goto __finally34;
 	__catch34_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp23_ = NULL;
+		GError* _tmp23_;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6017,7 +6027,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp23_);
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 6012 "PiwigoPublishing.c"
+#line 6022 "PiwigoPublishing.c"
 	}
 	__finally34:
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6028,7 +6038,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		g_clear_error (&_inner_error_);
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6023 "PiwigoPublishing.c"
+#line 6033 "PiwigoPublishing.c"
 	}
 }
 
@@ -6037,12 +6047,12 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
      * Event triggered when the add category action fails due to a network error.
      */
 static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = 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 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6067,7 +6077,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
 	_tmp5_ = err;
 #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 6062 "PiwigoPublishing.c"
+#line 6072 "PiwigoPublishing.c"
 }
 
 
@@ -6077,59 +6087,59 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
 static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender, num_photos_published);
-#line 6072 "PiwigoPublishing.c"
+#line 6082 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 6079 "PiwigoPublishing.c"
+#line 6089 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_status_updated ((PublishingPiwigoPiwigoPublisher*) self, file_number, fraction_complete);
-#line 6086 "PiwigoPublishing.c"
+#line 6096 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
-	gboolean _tmp0_ = FALSE;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp2_ = NULL;
-	PublishingPiwigoCategory* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	PublishingPiwigoPublishingParameters* _tmp5_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	PublishingPiwigoPublishingParameters* _tmp8_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	PublishingPiwigoPublishingParameters* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	PublishingPiwigoPublishingParameters* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	SpitPublishingPluginHost* _tmp16_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp17_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gboolean _tmp20_ = FALSE;
-	void* _tmp21_ = NULL;
-	GDestroyNotify _tmp22_ = NULL;
-	SpitPublishingProgressCallback _tmp23_ = NULL;
+	gboolean _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingPiwigoPublishingParameters* _tmp2_;
+	PublishingPiwigoCategory* _tmp3_;
+	gint _tmp4_;
+	PublishingPiwigoPublishingParameters* _tmp5_;
+	PublishingPiwigoPermissionLevel* _tmp6_;
+	gint _tmp7_;
+	PublishingPiwigoPublishingParameters* _tmp8_;
+	PublishingPiwigoSizeEntry* _tmp9_;
+	gint _tmp10_;
+	PublishingPiwigoPublishingParameters* _tmp11_;
+	gboolean _tmp12_;
+	PublishingPiwigoPublishingParameters* _tmp13_;
+	gboolean _tmp14_;
+	gboolean _tmp15_;
+	SpitPublishingPluginHost* _tmp16_;
+	PublishingPiwigoPublishingParameters* _tmp17_;
+	PublishingPiwigoSizeEntry* _tmp18_;
+	gint _tmp19_;
+	gboolean _tmp20_;
+	void* _tmp21_;
+	GDestroyNotify _tmp22_;
+	SpitPublishingProgressCallback _tmp23_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	SpitPublishingPublishable** _tmp26_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp24_;
+	gint _tmp25_;
+	SpitPublishingPublishable** _tmp26_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	PublishingPiwigoUploader* uploader = NULL;
-	PublishingPiwigoSession* _tmp27_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp28_ = NULL;
-	PublishingPiwigoUploader* _tmp29_ = NULL;
+	PublishingPiwigoSession* _tmp27_;
+	PublishingPiwigoPublishingParameters* _tmp28_;
+	PublishingPiwigoUploader* _tmp29_;
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6236,7 +6246,7 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 6231 "PiwigoPublishing.c"
+#line 6241 "PiwigoPublishing.c"
 }
 
 
@@ -6245,10 +6255,10 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
      * network transactions encapsulating uploads has completed successfully
      */
 static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6269,7 +6279,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_success_pane (self);
-#line 6264 "PiwigoPublishing.c"
+#line 6274 "PiwigoPublishing.c"
 }
 
 
@@ -6278,11 +6288,11 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
      * network transactions encapsulating uploads has caused a network error
      */
 static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6305,7 +6315,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo
 	_tmp4_ = err;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 6300 "PiwigoPublishing.c"
+#line 6310 "PiwigoPublishing.c"
 }
 
 
@@ -6313,14 +6323,14 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo
      * Event triggered when upload progresses and the status needs to be updated.
      */
 static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_ = FALSE;
-	gdouble _tmp1_ = 0.0;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gboolean _tmp0_;
+	gdouble _tmp1_;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6329,7 +6339,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
 	if (!_tmp0_) {
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6324 "PiwigoPublishing.c"
+#line 6334 "PiwigoPublishing.c"
 	}
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -6352,7 +6362,7 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
 	_tmp5_ = completed_fraction;
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 6346 "PiwigoPublishing.c"
+#line 6356 "PiwigoPublishing.c"
 }
 
 
@@ -6360,8 +6370,8 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
      * Action to display the success pane in the publishing dialog.
      */
 static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6374,7 +6384,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP
 	_tmp1_ = self->priv->host;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 6368 "PiwigoPublishing.c"
+#line 6378 "PiwigoPublishing.c"
 }
 
 
@@ -6382,7 +6392,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP
      * Helper event to handle network errors.
      */
 static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	GError* _tmp0_ = NULL;
+	GError* _tmp0_;
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6393,7 +6403,7 @@ static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwig
 	_tmp0_ = err;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp0_);
-#line 6387 "PiwigoPublishing.c"
+#line 6397 "PiwigoPublishing.c"
 }
 
 
@@ -6402,14 +6412,13 @@ static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwig
      */
 static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self, GError* e) {
 	gchar* error_type = NULL;
-	gchar* _tmp0_ = NULL;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GError* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
+	gchar* _tmp0_;
+	GError* _tmp1_;
+	const gchar* _tmp16_;
+	GError* _tmp17_;
+	const gchar* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6428,112 +6437,112 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 		_g_free0 (error_type);
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6422 "PiwigoPublishing.c"
+#line 6431 "PiwigoPublishing.c"
 	} else {
-		GError* _tmp2_ = NULL;
+		GError* _tmp2_;
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = e;
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 6429 "PiwigoPublishing.c"
-			gchar* _tmp3_ = NULL;
+#line 6438 "PiwigoPublishing.c"
+			gchar* _tmp3_;
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp3_ = g_strdup ("COMMUNICATION_FAILED");
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (error_type);
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			error_type = _tmp3_;
-#line 6437 "PiwigoPublishing.c"
+#line 6446 "PiwigoPublishing.c"
 		} else {
-			GError* _tmp4_ = NULL;
+			GError* _tmp4_;
 #line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp4_ = e;
 #line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 6444 "PiwigoPublishing.c"
-				gchar* _tmp5_ = NULL;
+#line 6453 "PiwigoPublishing.c"
+				gchar* _tmp5_;
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = g_strdup ("PROTOCOL_ERROR");
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (error_type);
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				error_type = _tmp5_;
-#line 6452 "PiwigoPublishing.c"
+#line 6461 "PiwigoPublishing.c"
 			} else {
-				GError* _tmp6_ = NULL;
+				GError* _tmp6_;
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = e;
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 6459 "PiwigoPublishing.c"
-					gchar* _tmp7_ = NULL;
+#line 6468 "PiwigoPublishing.c"
+					gchar* _tmp7_;
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp7_ = g_strdup ("SERVICE_ERROR");
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (error_type);
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					error_type = _tmp7_;
-#line 6467 "PiwigoPublishing.c"
+#line 6476 "PiwigoPublishing.c"
 				} else {
-					GError* _tmp8_ = NULL;
+					GError* _tmp8_;
 #line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp8_ = e;
 #line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 6474 "PiwigoPublishing.c"
-						gchar* _tmp9_ = NULL;
+#line 6483 "PiwigoPublishing.c"
+						gchar* _tmp9_;
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp9_ = g_strdup ("MALFORMED_RESPONSE");
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (error_type);
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						error_type = _tmp9_;
-#line 6482 "PiwigoPublishing.c"
+#line 6491 "PiwigoPublishing.c"
 					} else {
-						GError* _tmp10_ = NULL;
+						GError* _tmp10_;
 #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp10_ = e;
 #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 6489 "PiwigoPublishing.c"
-							gchar* _tmp11_ = NULL;
+#line 6498 "PiwigoPublishing.c"
+							gchar* _tmp11_;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (error_type);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							error_type = _tmp11_;
-#line 6497 "PiwigoPublishing.c"
+#line 6506 "PiwigoPublishing.c"
 						} else {
-							GError* _tmp12_ = NULL;
+							GError* _tmp12_;
 #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp12_ = e;
 #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 6504 "PiwigoPublishing.c"
-								gchar* _tmp13_ = NULL;
+#line 6513 "PiwigoPublishing.c"
+								gchar* _tmp13_;
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp13_ = g_strdup ("EXPIRED_SESSION");
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_g_free0 (error_type);
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								error_type = _tmp13_;
-#line 6512 "PiwigoPublishing.c"
+#line 6521 "PiwigoPublishing.c"
 							} else {
-								GError* _tmp14_ = NULL;
+								GError* _tmp14_;
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp14_ = e;
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								if (g_error_matches (_tmp14_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 6519 "PiwigoPublishing.c"
-									gchar* _tmp15_ = NULL;
+#line 6528 "PiwigoPublishing.c"
+									gchar* _tmp15_;
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_tmp15_ = g_strdup ("SECURE_CONNECTION_FAILED");
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_g_free0 (error_type);
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									error_type = _tmp15_;
-#line 6527 "PiwigoPublishing.c"
+#line 6536 "PiwigoPublishing.c"
 								}
 							}
 						}
@@ -6557,12 +6566,10 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp20_);
 #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = _ ("An error message occurred when publishing to Piwigo. Please try again.");
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_do_show_error_message (self, _tmp21_);
+	publishing_piwigo_piwigo_publisher_do_show_error_message (self, _ ("An error message occurred when publishing to Piwigo. Please try again."));
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (error_type);
-#line 6556 "PiwigoPublishing.c"
+#line 6563 "PiwigoPublishing.c"
 }
 
 
@@ -6570,8 +6577,8 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
      * Action to display an error message to the user.
      */
 static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6584,7 +6591,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
 	_tmp1_ = message;
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 6578 "PiwigoPublishing.c"
+#line 6585 "PiwigoPublishing.c"
 }
 
 
@@ -6600,28 +6607,28 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
 static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self) {
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return g_boxed_copy (soup_cookie_get_type (), self);
-#line 6594 "PiwigoPublishing.c"
+#line 6601 "PiwigoPublishing.c"
 }
 
 
 static gpointer __vala_SoupCookie_copy0 (gpointer self) {
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? _vala_SoupCookie_copy (self) : NULL;
-#line 6601 "PiwigoPublishing.c"
+#line 6608 "PiwigoPublishing.c"
 }
 
 
 static void _vala_SoupCookie_free (SoupCookie* self) {
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_boxed_free (soup_cookie_get_type (), self);
-#line 6608 "PiwigoPublishing.c"
+#line 6615 "PiwigoPublishing.c"
 }
 
 
 static void __vala_SoupCookie_free0_ (gpointer var) {
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(var == NULL) ? NULL : (var = (_vala_SoupCookie_free (var), NULL));
-#line 6615 "PiwigoPublishing.c"
+#line 6622 "PiwigoPublishing.c"
 }
 
 
@@ -6630,18 +6637,18 @@ static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self) {
 	g_slist_foreach (self, (GFunc) __vala_SoupCookie_free0_, NULL);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_slist_free (self);
-#line 6624 "PiwigoPublishing.c"
+#line 6631 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
 	gchar* result = NULL;
 	gchar* pwg_id = NULL;
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	SoupMessage* _tmp1_ = NULL;
-	SoupMessage* _tmp2_ = NULL;
-	GSList* _tmp3_ = NULL;
-	GSList* _tmp4_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	SoupMessage* _tmp1_;
+	SoupMessage* _tmp2_;
+	GSList* _tmp3_;
+	GSList* _tmp4_;
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6660,7 +6667,7 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
 	_tmp4_ = _tmp3_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp2_);
-#line 6654 "PiwigoPublishing.c"
+#line 6661 "PiwigoPublishing.c"
 	{
 		GSList* cookie_collection = NULL;
 		GSList* cookie_it = NULL;
@@ -6668,28 +6675,28 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
 		cookie_collection = _tmp4_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (cookie_it = cookie_collection; cookie_it != NULL; cookie_it = cookie_it->next) {
-#line 6662 "PiwigoPublishing.c"
-			SoupCookie* _tmp5_ = NULL;
+#line 6669 "PiwigoPublishing.c"
+			SoupCookie* _tmp5_;
 			SoupCookie* cookie = NULL;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp5_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			cookie = _tmp5_;
-#line 6669 "PiwigoPublishing.c"
+#line 6676 "PiwigoPublishing.c"
 			{
-				SoupCookie* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
+				SoupCookie* _tmp6_;
+				const gchar* _tmp7_;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = cookie;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = soup_cookie_get_name (_tmp6_);
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (g_strcmp0 (_tmp7_, "pwg_id") == 0) {
-#line 6679 "PiwigoPublishing.c"
-					SoupCookie* _tmp8_ = NULL;
-					const gchar* _tmp9_ = NULL;
-					gchar* _tmp10_ = NULL;
-					const gchar* _tmp11_ = NULL;
+#line 6686 "PiwigoPublishing.c"
+					SoupCookie* _tmp8_;
+					const gchar* _tmp9_;
+					gchar* _tmp10_;
+					const gchar* _tmp11_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp8_ = cookie;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6704,22 +6711,22 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
 					_tmp11_ = pwg_id;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp11_);
-#line 6698 "PiwigoPublishing.c"
+#line 6705 "PiwigoPublishing.c"
 				}
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				__vala_SoupCookie_free0 (cookie);
-#line 6702 "PiwigoPublishing.c"
+#line 6709 "PiwigoPublishing.c"
 			}
 		}
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		__g_slist_free___vala_SoupCookie_free0_0 (cookie_collection);
-#line 6707 "PiwigoPublishing.c"
+#line 6714 "PiwigoPublishing.c"
 	}
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = pwg_id;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6713 "PiwigoPublishing.c"
+#line 6720 "PiwigoPublishing.c"
 }
 
 
@@ -6730,7 +6737,7 @@ static void publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwig
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoPiwigoPublisherPrivate));
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_piwigo_publisher_finalize;
-#line 6724 "PiwigoPublishing.c"
+#line 6731 "PiwigoPublishing.c"
 }
 
 
@@ -6738,14 +6745,14 @@ static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interfa
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_get_service;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_is_running;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_start;
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_start;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_stop;
-#line 6739 "PiwigoPublishing.c"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_stop;
+#line 6746 "PiwigoPublishing.c"
 }
 
 
@@ -6766,11 +6773,15 @@ static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPi
 	self->priv->parameters = NULL;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 6760 "PiwigoPublishing.c"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
+#line 6771 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj) {
+static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj) {
 	PublishingPiwigoPiwigoPublisher * self;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
@@ -6794,7 +6805,7 @@ static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj) {
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_piwigo_publisher_parent_class)->finalize (obj);
-#line 6788 "PiwigoPublishing.c"
+#line 6799 "PiwigoPublishing.c"
 }
 
 
@@ -6814,11 +6825,11 @@ GType publishing_piwigo_piwigo_publisher_get_type (void) {
 
 PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type, PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
 	PublishingPiwigoUploader* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingPiwigoPublishingParameters* _tmp2_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingPiwigoPublishingParameters* _tmp2_;
+	PublishingPiwigoPublishingParameters* _tmp3_;
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6841,26 +6852,26 @@ PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_typ
 	self->priv->parameters = _tmp3_;
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 6835 "PiwigoPublishing.c"
+#line 6846 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_uploader_construct (PUBLISHING_PIWIGO_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6842 "PiwigoPublishing.c"
+#line 6853 "PiwigoPublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingPiwigoUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingPiwigoSession* _tmp1_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	PublishingPiwigoImagesAddTransaction* _tmp4_ = NULL;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingPiwigoSession* _tmp1_;
+	PublishingPiwigoPublishingParameters* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	PublishingPiwigoImagesAddTransaction* _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6883,7 +6894,7 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_
 	result = _tmp5_;
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6877 "PiwigoPublishing.c"
+#line 6888 "PiwigoPublishing.c"
 }
 
 
@@ -6895,19 +6906,19 @@ static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate));
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_piwigo_uploader_real_create_transaction;
-#line 6890 "PiwigoPublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_piwigo_uploader_real_create_transaction;
+#line 6901 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE (self);
-#line 6897 "PiwigoPublishing.c"
+#line 6908 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingPiwigoUploader * self;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
@@ -6915,7 +6926,7 @@ static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploa
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_piwigo_uploader_parent_class)->finalize (obj);
-#line 6909 "PiwigoPublishing.c"
+#line 6920 "PiwigoPublishing.c"
 }
 
 
@@ -6935,10 +6946,10 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType
 	PublishingPiwigoSSLErrorPane * self = NULL;
 	GTlsCertificate* cert = NULL;
 	gchar* text = NULL;
-	PublishingPiwigoSessionLoginTransaction* _tmp0_ = NULL;
+	PublishingPiwigoSessionLoginTransaction* _tmp0_;
 	GTlsCertificate* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6963,47 +6974,45 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType
 	_g_object_unref0 (cert);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 6957 "PiwigoPublishing.c"
+#line 6968 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
-#line 6964 "PiwigoPublishing.c"
+#line 6975 "PiwigoPublishing.c"
 }
 
 
 static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 	GcrSimpleCertificate* simple_cert = NULL;
-	GTlsCertificate* _tmp0_ = NULL;
-	GByteArray* _tmp1_ = NULL;
-	GByteArray* _tmp2_ = NULL;
-	GByteArray* _tmp3_ = NULL;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GcrSimpleCertificate* _tmp5_ = NULL;
-	GcrSimpleCertificate* _tmp6_ = NULL;
+	GTlsCertificate* _tmp0_;
+	GByteArray* _tmp1_;
+	GByteArray* _tmp2_;
+	GByteArray* _tmp3_;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+	GcrSimpleCertificate* _tmp5_;
+	GcrSimpleCertificate* _tmp6_;
 	GcrCertificateWidget* widget = NULL;
-	GcrSimpleCertificate* _tmp7_ = NULL;
-	GcrCertificateWidget* _tmp8_ = NULL;
+	GcrSimpleCertificate* _tmp7_;
+	GcrCertificateWidget* _tmp8_;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp9_ = NULL;
+	GtkSettings* _tmp9_;
 	GtkDialogFlags flags = 0;
-	gboolean _tmp10_ = FALSE;
+	gboolean _tmp10_;
 	GtkDialog* dialog = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	GtkDialogFlags _tmp18_ = 0;
-	const gchar* _tmp19_ = NULL;
-	GtkDialog* _tmp20_ = NULL;
-	GtkDialog* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-	GcrCertificateWidget* _tmp23_ = NULL;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	GtkDialogFlags _tmp17_;
+	GtkDialog* _tmp18_;
+	GtkDialog* _tmp19_;
+	GtkBox* _tmp20_;
+	GcrCertificateWidget* _tmp21_;
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->_cert;
 #line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7044,48 +7053,44 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 	_tmp10_ = use_header;
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp10_) {
-#line 7038 "PiwigoPublishing.c"
-		GtkDialogFlags _tmp11_ = 0;
+#line 7047 "PiwigoPublishing.c"
+		GtkDialogFlags _tmp11_;
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = flags;
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		flags = _tmp11_ | GTK_DIALOG_USE_HEADER_BAR;
-#line 7044 "PiwigoPublishing.c"
+#line 7053 "PiwigoPublishing.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = _ ("Certificate of %s");
+	_tmp12_ = publishing_piwigo_ssl_error_pane_get_host (self);
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = publishing_piwigo_ssl_error_pane_get_host (self);
+	_tmp13_ = _tmp12_;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _tmp13_;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = _tmp14_;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = g_strdup_printf (_tmp12_, _tmp15_);
+	_tmp15_ = g_strdup_printf (_ ("Certificate of %s"), _tmp14_);
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = _tmp16_;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = flags;
+	_tmp16_ = _tmp15_;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = _ ("_OK");
+	_tmp17_ = flags;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp17_, NULL, _tmp18_, _tmp19_, GTK_RESPONSE_OK, NULL);
+	_tmp18_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp16_, NULL, _tmp17_, _ ("_OK"), GTK_RESPONSE_OK, NULL);
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_ref_sink (_tmp20_);
+	g_object_ref_sink (_tmp18_);
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = _tmp20_;
+	_tmp19_ = _tmp18_;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp17_);
+	_g_free0 (_tmp16_);
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp15_);
+	_g_free0 (_tmp14_);
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	dialog = _tmp21_;
+	dialog = _tmp19_;
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
+	_tmp20_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp23_ = widget;
+	_tmp21_ = widget;
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
 #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_dialog_set_default_response (dialog, (gint) GTK_RESPONSE_OK);
 #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7102,67 +7107,66 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 	_g_object_unref0 (widget);
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (simple_cert);
-#line 7096 "PiwigoPublishing.c"
+#line 7101 "PiwigoPublishing.c"
 }
 
 
 static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7103 "PiwigoPublishing.c"
+#line 7108 "PiwigoPublishing.c"
 }
 
 
 static void __lambda6_ (PublishingPiwigoSSLErrorPane* self) {
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_emit_by_name (self, "proceed");
-#line 7110 "PiwigoPublishing.c"
+	g_signal_emit (self, publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL], 0);
+#line 7115 "PiwigoPublishing.c"
 }
 
 
 static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__lambda6_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7117 "PiwigoPublishing.c"
+#line 7122 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 	PublishingPiwigoSSLErrorPane * self;
 	GtkLabel* label = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GObject* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	GtkLabel* _tmp4_ = NULL;
-	GtkLabel* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkBuilder* _tmp13_ = NULL;
-	GtkBuilder* _tmp14_ = NULL;
-	GObject* _tmp15_ = NULL;
-	GtkLabel* _tmp16_ = NULL;
-	GtkLabel* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
+	GObject* _tmp2_;
+	GtkLabel* _tmp3_;
+	GtkLabel* _tmp4_;
+	GtkLabel* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	GtkLabel* _tmp11_;
+	GtkBuilder* _tmp12_;
+	GtkBuilder* _tmp13_;
+	GObject* _tmp14_;
+	GtkLabel* _tmp15_;
+	GtkLabel* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 	GtkButton* info = NULL;
-	GtkBuilder* _tmp21_ = NULL;
-	GtkBuilder* _tmp22_ = NULL;
-	GObject* _tmp23_ = NULL;
-	GtkButton* _tmp24_ = NULL;
-	GtkButton* _tmp25_ = NULL;
+	GtkBuilder* _tmp20_;
+	GtkBuilder* _tmp21_;
+	GObject* _tmp22_;
+	GtkButton* _tmp23_;
+	GtkButton* _tmp24_;
 	GtkButton* proceed = NULL;
-	GtkBuilder* _tmp26_ = NULL;
-	GtkBuilder* _tmp27_ = NULL;
-	GObject* _tmp28_ = NULL;
-	GtkButton* _tmp29_ = NULL;
-	GtkButton* _tmp30_ = NULL;
+	GtkBuilder* _tmp25_;
+	GtkBuilder* _tmp26_;
+	GObject* _tmp27_;
+	GtkButton* _tmp28_;
+	GtkButton* _tmp29_;
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
 #line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7184,85 +7188,83 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = label;
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = _ ("This does not look like the real <b>%s</b>. Attackers might be trying " \
-"to steal or alter information going to or from this site (for example," \
-" private messages, credit card information, or passwords).");
+	_tmp6_ = publishing_piwigo_ssl_error_pane_get_host (self);
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = publishing_piwigo_ssl_error_pane_get_host (self);
+	_tmp7_ = _tmp6_;
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _tmp7_;
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = g_strdup_printf (_tmp6_, _tmp9_);
+	_tmp9_ = g_strdup_printf (_ ("This does not look like the real <b>%s</b>. Attackers might be trying " \
+"to steal or alter information going to or from this site (for example," \
+" private messages, credit card information, or passwords)."), _tmp8_);
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_label_set_text (_tmp5_, _tmp11_);
+	gtk_label_set_text (_tmp5_, _tmp10_);
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp11_);
+	_g_free0 (_tmp10_);
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp8_);
 #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = label;
+	_tmp11_ = label;
 #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_label_set_use_markup (_tmp12_, TRUE);
+	gtk_label_set_use_markup (_tmp11_, TRUE);
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+	_tmp12_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = gtk_builder_get_object (_tmp14_, "ssl_errors");
+	_tmp14_ = gtk_builder_get_object (_tmp13_, "ssl_errors");
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp15_) : NULL);
+	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp14_) : NULL);
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (label);
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	label = _tmp16_;
+	label = _tmp15_;
 #line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp13_);
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = label;
+	_tmp16_ = label;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = publishing_piwigo_ssl_error_pane_get_error_text (self);
+	_tmp17_ = publishing_piwigo_ssl_error_pane_get_error_text (self);
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = _tmp18_;
+	_tmp18_ = _tmp17_;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_label_set_text (_tmp17_, _tmp20_);
+	gtk_label_set_text (_tmp16_, _tmp19_);
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp20_);
+	_g_free0 (_tmp19_);
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+	_tmp20_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = _tmp21_;
+	_tmp21_ = _tmp20_;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp23_ = gtk_builder_get_object (_tmp22_, "default");
+	_tmp22_ = gtk_builder_get_object (_tmp21_, "default");
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
+	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_button_get_type ()) ? ((GtkButton*) _tmp22_) : NULL);
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp25_ = _tmp24_;
+	_tmp24_ = _tmp23_;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp22_);
+	_g_object_unref0 (_tmp21_);
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	info = _tmp25_;
+	info = _tmp24_;
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (info, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0);
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp26_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+	_tmp25_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp27_ = _tmp26_;
+	_tmp26_ = _tmp25_;
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp28_ = gtk_builder_get_object (_tmp27_, "proceed_button");
+	_tmp27_ = gtk_builder_get_object (_tmp26_, "proceed_button");
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL);
+	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_button_get_type ()) ? ((GtkButton*) _tmp27_) : NULL);
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp30_ = _tmp29_;
+	_tmp29_ = _tmp28_;
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp27_);
+	_g_object_unref0 (_tmp26_);
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	proceed = _tmp30_;
+	proceed = _tmp29_;
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda6__gtk_button_clicked, self, 0);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7271,14 +7273,14 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 	_g_object_unref0 (info);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (label);
-#line 7263 "PiwigoPublishing.c"
+#line 7265 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self) {
 	gchar* result;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7289,32 +7291,36 @@ gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane*
 	result = _tmp1_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7281 "PiwigoPublishing.c"
+#line 7283 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_host (self)) != 0) {
+#line 7292 "PiwigoPublishing.c"
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = value;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (self->priv->_host);
+		_tmp1_ = g_strdup (_tmp0_);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_free0 (self->priv->_host);
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_host = _tmp1_;
+		self->priv->_host = _tmp1_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "host");
-#line 7300 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "host");
+#line 7305 "PiwigoPublishing.c"
+	}
 }
 
 
 static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self) {
 	GTlsCertificate* result;
-	GTlsCertificate* _tmp0_ = NULL;
+	GTlsCertificate* _tmp0_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7323,33 +7329,37 @@ static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiw
 	result = _tmp0_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7315 "PiwigoPublishing.c"
+#line 7321 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value) {
-	GTlsCertificate* _tmp0_ = NULL;
-	GTlsCertificate* _tmp1_ = NULL;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_ssl_error_pane_get_cert (self) != value) {
+#line 7330 "PiwigoPublishing.c"
+		GTlsCertificate* _tmp0_;
+		GTlsCertificate* _tmp1_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->_cert);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (self->priv->_cert);
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_cert = _tmp1_;
+		self->priv->_cert = _tmp1_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "cert");
-#line 7334 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "cert");
+#line 7343 "PiwigoPublishing.c"
+	}
 }
 
 
 gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self) {
 	gchar* result;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7360,26 +7370,30 @@ gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLError
 	result = _tmp1_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7352 "PiwigoPublishing.c"
+#line 7362 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_error_text (self)) != 0) {
+#line 7371 "PiwigoPublishing.c"
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = value;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (self->priv->_error_text);
+		_tmp1_ = g_strdup (_tmp0_);
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_error_text = _tmp1_;
+		_g_free0 (self->priv->_error_text);
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "error-text");
-#line 7371 "PiwigoPublishing.c"
+		self->priv->_error_text = _tmp1_;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_object_notify ((GObject *) self, "error-text");
+#line 7384 "PiwigoPublishing.c"
+	}
 }
 
 
@@ -7389,7 +7403,7 @@ static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErro
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoSSLErrorPanePrivate));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_ssl_error_pane_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_piwigo_ssl_error_pane_real_constructed;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_ssl_error_pane_get_property;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7397,25 +7411,25 @@ static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErro
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_ssl_error_pane_finalize;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 7396 "PiwigoPublishing.c"
+	publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 7410 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self) {
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE (self);
-#line 7403 "PiwigoPublishing.c"
+#line 7417 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj) {
+static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj) {
 	PublishingPiwigoSSLErrorPane * self;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
@@ -7427,7 +7441,7 @@ static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj) {
 	_g_free0 (self->priv->_error_text);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->finalize (obj);
-#line 7419 "PiwigoPublishing.c"
+#line 7433 "PiwigoPublishing.c"
 }
 
 
@@ -7449,30 +7463,30 @@ static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * objec
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	switch (property_id) {
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST:
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_host (self));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT:
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_object (value, publishing_piwigo_ssl_error_pane_get_cert (self));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT:
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_error_text (self));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7458 "PiwigoPublishing.c"
+#line 7472 "PiwigoPublishing.c"
 		default:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7464 "PiwigoPublishing.c"
+#line 7478 "PiwigoPublishing.c"
 	}
 }
 
@@ -7483,30 +7497,30 @@ static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * objec
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	switch (property_id) {
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST:
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_ssl_error_pane_set_host (self, g_value_get_string (value));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT:
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_ssl_error_pane_set_cert (self, g_value_get_object (value));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT:
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_ssl_error_pane_set_error_text (self, g_value_get_string (value));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7492 "PiwigoPublishing.c"
+#line 7506 "PiwigoPublishing.c"
 		default:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7498 "PiwigoPublishing.c"
+#line 7512 "PiwigoPublishing.c"
 	}
 }
 
@@ -7525,8 +7539,8 @@ GType publishing_piwigo_authentication_pane_mode_get_type (void) {
 
 PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
 	PublishingPiwigoAuthenticationPane * self = NULL;
-	PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
-	PublishingPiwigoPiwigoPublisher* _tmp1_ = NULL;
+	PublishingPiwigoAuthenticationPaneMode _tmp0_;
+	PublishingPiwigoPiwigoPublisher* _tmp1_;
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
 #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7537,92 +7551,92 @@ PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_constr
 	self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", _tmp0_, "publisher", _tmp1_, NULL);
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 7529 "PiwigoPublishing.c"
+#line 7543 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 7536 "PiwigoPublishing.c"
+#line 7550 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_user_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7543 "PiwigoPublishing.c"
+#line 7557 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_url_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7550 "PiwigoPublishing.c"
+#line 7564 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_password_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7557 "PiwigoPublishing.c"
+#line 7571 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_login_button_clicked ((PublishingPiwigoAuthenticationPane*) self);
-#line 7564 "PiwigoPublishing.c"
+#line 7578 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_real_constructed (GObject* base) {
 	PublishingPiwigoAuthenticationPane * self;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 	GtkLabel* message_label = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GObject* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	PublishingPiwigoAuthenticationPaneMode _tmp4_ = 0;
-	GtkBuilder* _tmp17_ = NULL;
-	GObject* _tmp18_ = NULL;
-	GtkEntry* _tmp19_ = NULL;
+	GtkBuilder* _tmp1_;
+	GObject* _tmp2_;
+	GtkLabel* _tmp3_;
+	PublishingPiwigoAuthenticationPaneMode _tmp4_;
+	GtkBuilder* _tmp15_;
+	GObject* _tmp16_;
+	GtkEntry* _tmp17_;
 	gchar* persistent_url = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	GtkBuilder* _tmp25_ = NULL;
-	GObject* _tmp26_ = NULL;
-	GtkEntry* _tmp27_ = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp18_;
+	gchar* _tmp19_;
+	const gchar* _tmp20_;
+	GtkBuilder* _tmp23_;
+	GObject* _tmp24_;
+	GtkEntry* _tmp25_;
 	gchar* persistent_username = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	const gchar* _tmp30_ = NULL;
-	GtkBuilder* _tmp33_ = NULL;
-	GObject* _tmp34_ = NULL;
-	GtkEntry* _tmp35_ = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp26_;
+	gchar* _tmp27_;
+	const gchar* _tmp28_;
+	GtkBuilder* _tmp31_;
+	GObject* _tmp32_;
+	GtkEntry* _tmp33_;
 	gchar* persistent_password = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
-	GtkBuilder* _tmp41_ = NULL;
-	GObject* _tmp42_ = NULL;
-	GtkSwitch* _tmp43_ = NULL;
-	GtkSwitch* _tmp44_ = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp45_ = NULL;
-	gboolean _tmp46_ = FALSE;
-	GtkBuilder* _tmp47_ = NULL;
-	GObject* _tmp48_ = NULL;
-	GtkButton* _tmp49_ = NULL;
-	GtkEntry* _tmp50_ = NULL;
-	GtkEntry* _tmp51_ = NULL;
-	GtkEntry* _tmp52_ = NULL;
-	GtkButton* _tmp53_ = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp54_ = NULL;
-	SpitPublishingPluginHost* _tmp55_ = NULL;
-	SpitPublishingPluginHost* _tmp56_ = NULL;
-	GtkButton* _tmp57_ = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp34_;
+	gchar* _tmp35_;
+	const gchar* _tmp36_;
+	GtkBuilder* _tmp39_;
+	GObject* _tmp40_;
+	GtkSwitch* _tmp41_;
+	GtkSwitch* _tmp42_;
+	PublishingPiwigoPiwigoPublisher* _tmp43_;
+	gboolean _tmp44_;
+	GtkBuilder* _tmp45_;
+	GObject* _tmp46_;
+	GtkButton* _tmp47_;
+	GtkEntry* _tmp48_;
+	GtkEntry* _tmp49_;
+	GtkEntry* _tmp50_;
+	GtkButton* _tmp51_;
+	PublishingPiwigoPiwigoPublisher* _tmp52_;
+	SpitPublishingPluginHost* _tmp53_;
+	SpitPublishingPluginHost* _tmp54_;
+	GtkButton* _tmp55_;
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7645,10 +7659,10 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	switch (_tmp4_) {
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
-#line 7637 "PiwigoPublishing.c"
+#line 7651 "PiwigoPublishing.c"
 		{
-			GtkLabel* _tmp5_ = NULL;
-			const gchar* _tmp6_ = NULL;
+			GtkLabel* _tmp5_;
+			const gchar* _tmp6_;
 #line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp5_ = message_label;
 #line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7657,216 +7671,210 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 			gtk_label_set_text (_tmp5_, _tmp6_);
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 7649 "PiwigoPublishing.c"
+#line 7663 "PiwigoPublishing.c"
 		}
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
-#line 7653 "PiwigoPublishing.c"
+#line 7667 "PiwigoPublishing.c"
 		{
-			GtkLabel* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
+			GtkLabel* _tmp7_;
+			const gchar* _tmp8_;
+			gchar* _tmp9_;
+			gchar* _tmp10_;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = message_label;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp8_ = _ ("Invalid URL");
+			_tmp8_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp9_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
+			_tmp9_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid URL"), _tmp8_);
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp10_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp8_, _tmp9_);
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp11_ = _tmp10_;
+			_tmp10_ = _tmp9_;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_label_set_markup (_tmp7_, _tmp11_);
+			gtk_label_set_markup (_tmp7_, _tmp10_);
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_g_free0 (_tmp11_);
+			_g_free0 (_tmp10_);
 #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 7676 "PiwigoPublishing.c"
+#line 7687 "PiwigoPublishing.c"
 		}
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 7680 "PiwigoPublishing.c"
+#line 7691 "PiwigoPublishing.c"
 		{
-			GtkLabel* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp12_ = message_label;
+			GtkLabel* _tmp11_;
+			const gchar* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp13_ = _ ("Invalid User Name or Password");
+			_tmp11_ = message_label;
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp14_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+			_tmp12_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp13_, _tmp14_);
+			_tmp13_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp12_);
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp16_ = _tmp15_;
+			_tmp14_ = _tmp13_;
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_label_set_markup (_tmp12_, _tmp16_);
+			gtk_label_set_markup (_tmp11_, _tmp14_);
 #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_g_free0 (_tmp16_);
+			_g_free0 (_tmp14_);
 #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 7703 "PiwigoPublishing.c"
+#line 7711 "PiwigoPublishing.c"
 		}
 		default:
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7708 "PiwigoPublishing.c"
+#line 7716 "PiwigoPublishing.c"
 	}
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = builder;
+	_tmp15_ = builder;
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "url_entry");
+	_tmp16_ = gtk_builder_get_object (_tmp15_, "url_entry");
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp16_) : NULL);
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->url_entry);
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->url_entry = _tmp19_;
+	self->priv->url_entry = _tmp17_;
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = self->priv->_publisher;
+	_tmp18_ = self->priv->_publisher;
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp20_);
+	_tmp19_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp18_);
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	persistent_url = _tmp21_;
+	persistent_url = _tmp19_;
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = persistent_url;
+	_tmp20_ = persistent_url;
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp22_ != NULL) {
-#line 7730 "PiwigoPublishing.c"
-		GtkEntry* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
+	if (_tmp20_ != NULL) {
+#line 7738 "PiwigoPublishing.c"
+		GtkEntry* _tmp21_;
+		const gchar* _tmp22_;
 #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp23_ = self->priv->url_entry;
+		_tmp21_ = self->priv->url_entry;
 #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp24_ = persistent_url;
+		_tmp22_ = persistent_url;
 #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_entry_set_text (_tmp23_, _tmp24_);
-#line 7739 "PiwigoPublishing.c"
+		gtk_entry_set_text (_tmp21_, _tmp22_);
+#line 7747 "PiwigoPublishing.c"
 	}
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp25_ = builder;
+	_tmp23_ = builder;
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "username_entry");
+	_tmp24_ = gtk_builder_get_object (_tmp23_, "username_entry");
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
+	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->username_entry);
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->username_entry = _tmp27_;
+	self->priv->username_entry = _tmp25_;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp28_ = self->priv->_publisher;
+	_tmp26_ = self->priv->_publisher;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp29_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp28_);
+	_tmp27_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp26_);
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	persistent_username = _tmp29_;
+	persistent_username = _tmp27_;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp30_ = persistent_username;
+	_tmp28_ = persistent_username;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp30_ != NULL) {
-#line 7761 "PiwigoPublishing.c"
-		GtkEntry* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
+	if (_tmp28_ != NULL) {
+#line 7769 "PiwigoPublishing.c"
+		GtkEntry* _tmp29_;
+		const gchar* _tmp30_;
 #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp31_ = self->priv->username_entry;
+		_tmp29_ = self->priv->username_entry;
 #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp32_ = persistent_username;
+		_tmp30_ = persistent_username;
 #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_entry_set_text (_tmp31_, _tmp32_);
-#line 7770 "PiwigoPublishing.c"
+		gtk_entry_set_text (_tmp29_, _tmp30_);
+#line 7778 "PiwigoPublishing.c"
 	}
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp33_ = builder;
+	_tmp31_ = builder;
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp34_ = gtk_builder_get_object (_tmp33_, "password_entry");
+	_tmp32_ = gtk_builder_get_object (_tmp31_, "password_entry");
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp34_) : NULL);
+	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL);
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->password_entry);
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->password_entry = _tmp35_;
+	self->priv->password_entry = _tmp33_;
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp36_ = self->priv->_publisher;
+	_tmp34_ = self->priv->_publisher;
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp37_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp36_);
+	_tmp35_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp34_);
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	persistent_password = _tmp37_;
+	persistent_password = _tmp35_;
 #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp38_ = persistent_password;
+	_tmp36_ = persistent_password;
 #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp38_ != NULL) {
-#line 7792 "PiwigoPublishing.c"
-		GtkEntry* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
+	if (_tmp36_ != NULL) {
+#line 7800 "PiwigoPublishing.c"
+		GtkEntry* _tmp37_;
+		const gchar* _tmp38_;
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp39_ = self->priv->password_entry;
+		_tmp37_ = self->priv->password_entry;
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp40_ = persistent_password;
+		_tmp38_ = persistent_password;
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_entry_set_text (_tmp39_, _tmp40_);
-#line 7801 "PiwigoPublishing.c"
+		gtk_entry_set_text (_tmp37_, _tmp38_);
+#line 7809 "PiwigoPublishing.c"
 	}
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp41_ = builder;
+	_tmp39_ = builder;
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp42_ = gtk_builder_get_object (_tmp41_, "remember_password_checkbutton");
+	_tmp40_ = gtk_builder_get_object (_tmp39_, "remember_password_checkbutton");
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_switch_get_type ()) ? ((GtkSwitch*) _tmp42_) : NULL);
+	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_switch_get_type ()) ? ((GtkSwitch*) _tmp40_) : NULL);
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->remember_password_checkbutton);
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->remember_password_checkbutton = _tmp43_;
+	self->priv->remember_password_checkbutton = _tmp41_;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp44_ = self->priv->remember_password_checkbutton;
+	_tmp42_ = self->priv->remember_password_checkbutton;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp45_ = self->priv->_publisher;
+	_tmp43_ = self->priv->_publisher;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp46_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp45_);
+	_tmp44_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp43_);
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_switch_set_active (_tmp44_, _tmp46_);
+	gtk_switch_set_active (_tmp42_, _tmp44_);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp47_ = builder;
+	_tmp45_ = builder;
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp48_ = gtk_builder_get_object (_tmp47_, "login_button");
+	_tmp46_ = gtk_builder_get_object (_tmp45_, "login_button");
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, gtk_button_get_type ()) ? ((GtkButton*) _tmp48_) : NULL);
+	_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_button_get_type ()) ? ((GtkButton*) _tmp46_) : NULL);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->login_button);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->login_button = _tmp49_;
+	self->priv->login_button = _tmp47_;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp50_ = self->priv->username_entry;
+	_tmp48_ = self->priv->username_entry;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
 #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp51_ = self->priv->url_entry;
+	_tmp49_ = self->priv->url_entry;
 #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp52_ = self->priv->password_entry;
+	_tmp50_ = self->priv->password_entry;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
 #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp53_ = self->priv->login_button;
+	_tmp51_ = self->priv->login_button;
 #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (_tmp53_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp54_ = self->priv->_publisher;
+	_tmp52_ = self->priv->_publisher;
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp55_ = publishing_piwigo_piwigo_publisher_get_host (_tmp54_);
+	_tmp53_ = publishing_piwigo_piwigo_publisher_get_host (_tmp52_);
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp56_ = _tmp55_;
+	_tmp54_ = _tmp53_;
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp57_ = self->priv->login_button;
+	_tmp55_ = self->priv->login_button;
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp56_);
+	_g_object_unref0 (_tmp54_);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_password);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7877,19 +7885,19 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	_g_object_unref0 (message_label);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (builder);
-#line 7869 "PiwigoPublishing.c"
+#line 7877 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkEntry* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkSwitch* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	GtkEntry* _tmp2_;
+	const gchar* _tmp3_;
+	GtkEntry* _tmp4_;
+	const gchar* _tmp5_;
+	GtkSwitch* _tmp6_;
+	gboolean _tmp7_;
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7909,8 +7917,8 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
 #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = gtk_switch_get_active (_tmp6_);
 #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 7902 "PiwigoPublishing.c"
+	g_signal_emit (self, publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_);
+#line 7910 "PiwigoPublishing.c"
 }
 
 
@@ -7919,7 +7927,7 @@ static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwi
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7911 "PiwigoPublishing.c"
+#line 7919 "PiwigoPublishing.c"
 }
 
 
@@ -7928,7 +7936,7 @@ static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiw
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7920 "PiwigoPublishing.c"
+#line 7928 "PiwigoPublishing.c"
 }
 
 
@@ -7937,17 +7945,17 @@ static void publishing_piwigo_authentication_pane_on_password_changed (Publishin
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7929 "PiwigoPublishing.c"
+#line 7937 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GtkEntry* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	guint _tmp4_ = 0U;
-	GtkButton* _tmp11_ = NULL;
+	GtkEntry* _tmp2_;
+	guint _tmp3_;
+	guint _tmp4_;
+	GtkButton* _tmp11_;
 #line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7958,10 +7966,10 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 	_tmp4_ = _tmp3_;
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp4_ != ((guint) 0)) {
-#line 7950 "PiwigoPublishing.c"
-		GtkEntry* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		guint _tmp7_ = 0U;
+#line 7958 "PiwigoPublishing.c"
+		GtkEntry* _tmp5_;
+		guint _tmp6_;
+		guint _tmp7_;
 #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = self->priv->username_entry;
 #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7970,18 +7978,18 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 		_tmp7_ = _tmp6_;
 #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp7_ != ((guint) 0);
-#line 7962 "PiwigoPublishing.c"
+#line 7970 "PiwigoPublishing.c"
 	} else {
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 7966 "PiwigoPublishing.c"
+#line 7974 "PiwigoPublishing.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 7970 "PiwigoPublishing.c"
-		GtkEntry* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		guint _tmp10_ = 0U;
+#line 7978 "PiwigoPublishing.c"
+		GtkEntry* _tmp8_;
+		guint _tmp9_;
+		guint _tmp10_;
 #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->password_entry;
 #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7990,25 +7998,25 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 		_tmp10_ = _tmp9_;
 #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp10_ != ((guint) 0);
-#line 7982 "PiwigoPublishing.c"
+#line 7990 "PiwigoPublishing.c"
 	} else {
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 7986 "PiwigoPublishing.c"
+#line 7994 "PiwigoPublishing.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = self->priv->login_button;
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7992 "PiwigoPublishing.c"
+#line 8000 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
 	PublishingPiwigoAuthenticationPane * self;
-	GtkEntry* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	GtkEntry* _tmp1_;
+	GtkButton* _tmp2_;
 #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
 #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8027,13 +8035,13 @@ static void publishing_piwigo_authentication_pane_real_on_pane_installed (Shotwe
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 8019 "PiwigoPublishing.c"
+#line 8027 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self) {
 	PublishingPiwigoAuthenticationPaneMode result;
-	PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
+	PublishingPiwigoAuthenticationPaneMode _tmp0_;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), 0);
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8042,27 +8050,31 @@ PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get
 	result = _tmp0_;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8034 "PiwigoPublishing.c"
+#line 8042 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value) {
-	PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_authentication_pane_get_mode (self) != value) {
+#line 8051 "PiwigoPublishing.c"
+		PublishingPiwigoAuthenticationPaneMode _tmp0_;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = value;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_mode = _tmp0_;
+		self->priv->_mode = _tmp0_;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "mode");
-#line 8048 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "mode");
+#line 8059 "PiwigoPublishing.c"
+	}
 }
 
 
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self) {
 	PublishingPiwigoPiwigoPublisher* result;
-	PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp0_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), NULL);
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8071,21 +8083,25 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publi
 	result = _tmp0_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8063 "PiwigoPublishing.c"
+#line 8075 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value) {
-	PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_authentication_pane_get_publisher (self) != value) {
+#line 8084 "PiwigoPublishing.c"
+		PublishingPiwigoPiwigoPublisher* _tmp0_;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = value;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_publisher = _tmp0_;
+		self->priv->_publisher = _tmp0_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "publisher");
-#line 8077 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "publisher");
+#line 8092 "PiwigoPublishing.c"
+	}
 }
 
 
@@ -8104,37 +8120,34 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure
 		data1 = closure->data;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8096 "PiwigoPublishing.c"
+#line 8112 "PiwigoPublishing.c"
 	} else {
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 8102 "PiwigoPublishing.c"
+#line 8118 "PiwigoPublishing.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 8108 "PiwigoPublishing.c"
+#line 8124 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAuthenticationPaneClass * klass) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoAuthenticationPanePrivate));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_authentication_pane_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_piwigo_authentication_pane_real_constructed;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) publishing_piwigo_authentication_pane_real_on_pane_installed;
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*) (ShotwellPluginsCommonBuilderPane *)) publishing_piwigo_authentication_pane_real_on_pane_installed;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_authentication_pane_get_property;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8142,43 +8155,37 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_authentication_pane_finalize;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = _ ("Enter the URL of your Piwigo photo library as well as the username and" \
-" password associated with your Piwigo account for that library.");
+	publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 #line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("Enter the URL of your Piwigo photo library as well as the username and" \
+" password associated with your Piwigo account for that library."));
 #line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_authentication_pane_INTRO_MESSAGE = _tmp1_;
+	publishing_piwigo_authentication_pane_INTRO_MESSAGE = _tmp0_;
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = _ ("Shotwell cannot contact your Piwigo photo library. Please verify the U" \
-"RL you entered");
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (_ ("Shotwell cannot contact your Piwigo photo library. Please verify the U" \
+"RL you entered"));
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = _tmp3_;
+	publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = _tmp1_;
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _ ("Username and/or password invalid. Please try again");
+	_tmp2_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp5_;
-#line 8157 "PiwigoPublishing.c"
+	publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp2_;
+#line 8164 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self) {
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 8164 "PiwigoPublishing.c"
+#line 8171 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_finalize (GObject* obj) {
+static void publishing_piwigo_authentication_pane_finalize (GObject * obj) {
 	PublishingPiwigoAuthenticationPane * self;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
@@ -8194,7 +8201,7 @@ static void publishing_piwigo_authentication_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->login_button);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->finalize (obj);
-#line 8184 "PiwigoPublishing.c"
+#line 8191 "PiwigoPublishing.c"
 }
 
 
@@ -8220,24 +8227,24 @@ static void _vala_publishing_piwigo_authentication_pane_get_property (GObject *
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	switch (property_id) {
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE:
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_enum (value, publishing_piwigo_authentication_pane_get_mode (self));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER:
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_object (value, publishing_piwigo_authentication_pane_get_publisher (self));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8221 "PiwigoPublishing.c"
+#line 8228 "PiwigoPublishing.c"
 		default:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8227 "PiwigoPublishing.c"
+#line 8234 "PiwigoPublishing.c"
 	}
 }
 
@@ -8248,24 +8255,24 @@ static void _vala_publishing_piwigo_authentication_pane_set_property (GObject *
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	switch (property_id) {
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE:
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_authentication_pane_set_mode (self, g_value_get_enum (value));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER:
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_authentication_pane_set_publisher (self, g_value_get_object (value));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8249 "PiwigoPublishing.c"
+#line 8256 "PiwigoPublishing.c"
 		default:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8255 "PiwigoPublishing.c"
+#line 8262 "PiwigoPublishing.c"
 	}
 }
 
@@ -8273,7 +8280,7 @@ static void _vala_publishing_piwigo_authentication_pane_set_property (GObject *
 static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_category_ref (self) : NULL;
-#line 8263 "PiwigoPublishing.c"
+#line 8270 "PiwigoPublishing.c"
 }
 
 
@@ -8284,17 +8291,17 @@ static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory**
 	result = g_new0 (PublishingPiwigoCategory*, length + 1);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 8274 "PiwigoPublishing.c"
-		PublishingPiwigoCategory* _tmp0_ = NULL;
+#line 8281 "PiwigoPublishing.c"
+		PublishingPiwigoCategory* _tmp0_;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result[i] = _tmp0_;
-#line 8280 "PiwigoPublishing.c"
+#line 8287 "PiwigoPublishing.c"
 	}
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8284 "PiwigoPublishing.c"
+#line 8291 "PiwigoPublishing.c"
 }
 
 
@@ -8303,27 +8310,27 @@ static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpoi
 	result = publishing_piwigo_category_equal ((PublishingPiwigoCategory*) a, (PublishingPiwigoCategory*) b);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8293 "PiwigoPublishing.c"
+#line 8300 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
 	PublishingPiwigoPublishingOptionsPane * self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	PublishingPiwigoCategory** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	PublishingPiwigoCategory** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	GeeArrayList* _tmp8_ = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	PublishingPiwigoCategory** _tmp6_;
+	gint _tmp6__length1;
+	PublishingPiwigoCategory** _tmp7_;
+	gint _tmp7__length1;
+	GeeArrayList* _tmp8_;
+	GeeArrayList* _tmp9_;
+	PublishingPiwigoPiwigoPublisher* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
 #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8364,116 +8371,116 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane
 	_g_object_unref0 (_tmp9_);
 #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 8354 "PiwigoPublishing.c"
+#line 8361 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
 #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
-#line 8361 "PiwigoPublishing.c"
+#line 8368 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_logout_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8368 "PiwigoPublishing.c"
+#line 8375 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_publish_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8375 "PiwigoPublishing.c"
+#line 8382 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8382 "PiwigoPublishing.c"
+#line 8389 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8389 "PiwigoPublishing.c"
+#line 8396 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_new_category_entry_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8396 "PiwigoPublishing.c"
+#line 8403 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_existing_combo_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8403 "PiwigoPublishing.c"
+#line 8410 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base) {
 	PublishingPiwigoPublishingOptionsPane * self;
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkRadioButton* _tmp2_ = NULL;
-	GObject* _tmp3_ = NULL;
-	GtkRadioButton* _tmp4_ = NULL;
-	GObject* _tmp5_ = NULL;
-	GtkComboBoxText* _tmp6_ = NULL;
-	GObject* _tmp7_ = NULL;
-	GtkEntry* _tmp8_ = NULL;
-	GObject* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkComboBoxText* _tmp12_ = NULL;
-	GObject* _tmp13_ = NULL;
-	GtkTextView* _tmp14_ = NULL;
-	GtkTextView* _tmp15_ = NULL;
-	GtkTextBuffer* _tmp16_ = NULL;
-	GtkTextBuffer* _tmp17_ = NULL;
-	GObject* _tmp18_ = NULL;
-	GtkLabel* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkComboBoxText* _tmp21_ = NULL;
-	GObject* _tmp22_ = NULL;
-	GtkComboBoxText* _tmp23_ = NULL;
-	GObject* _tmp24_ = NULL;
-	GtkCheckButton* _tmp25_ = NULL;
-	GtkCheckButton* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
-	GObject* _tmp28_ = NULL;
-	GtkCheckButton* _tmp29_ = NULL;
-	GtkCheckButton* _tmp30_ = NULL;
-	gboolean _tmp31_ = FALSE;
-	GObject* _tmp32_ = NULL;
-	GtkCheckButton* _tmp33_ = NULL;
-	GtkCheckButton* _tmp34_ = NULL;
-	gboolean _tmp35_ = FALSE;
-	GObject* _tmp36_ = NULL;
-	GtkButton* _tmp37_ = NULL;
-	GtkButton* _tmp38_ = NULL;
-	GObject* _tmp39_ = NULL;
-	GtkButton* _tmp40_ = NULL;
-	GtkButton* _tmp41_ = NULL;
-	GtkRadioButton* _tmp42_ = NULL;
-	GtkRadioButton* _tmp43_ = NULL;
-	GtkEntry* _tmp44_ = NULL;
-	GtkComboBoxText* _tmp45_ = NULL;
-	gint _tmp46_ = 0;
-	PublishingPiwigoPermissionLevel** _tmp47_ = NULL;
-	gint _tmp48_ = 0;
-	PublishingPiwigoSizeEntry** _tmp49_ = NULL;
-	GtkTextView* _tmp50_ = NULL;
-	GtkTextBuffer* _tmp51_ = NULL;
-	GtkTextBuffer* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkRadioButton* _tmp2_;
+	GObject* _tmp3_;
+	GtkRadioButton* _tmp4_;
+	GObject* _tmp5_;
+	GtkComboBoxText* _tmp6_;
+	GObject* _tmp7_;
+	GtkEntry* _tmp8_;
+	GObject* _tmp9_;
+	GtkLabel* _tmp10_;
+	GObject* _tmp11_;
+	GtkComboBoxText* _tmp12_;
+	GObject* _tmp13_;
+	GtkTextView* _tmp14_;
+	GtkTextView* _tmp15_;
+	GtkTextBuffer* _tmp16_;
+	GtkTextBuffer* _tmp17_;
+	GObject* _tmp18_;
+	GtkLabel* _tmp19_;
+	GObject* _tmp20_;
+	GtkComboBoxText* _tmp21_;
+	GObject* _tmp22_;
+	GtkComboBoxText* _tmp23_;
+	GObject* _tmp24_;
+	GtkCheckButton* _tmp25_;
+	GtkCheckButton* _tmp26_;
+	gboolean _tmp27_;
+	GObject* _tmp28_;
+	GtkCheckButton* _tmp29_;
+	GtkCheckButton* _tmp30_;
+	gboolean _tmp31_;
+	GObject* _tmp32_;
+	GtkCheckButton* _tmp33_;
+	GtkCheckButton* _tmp34_;
+	gboolean _tmp35_;
+	GObject* _tmp36_;
+	GtkButton* _tmp37_;
+	GtkButton* _tmp38_;
+	GObject* _tmp39_;
+	GtkButton* _tmp40_;
+	GtkButton* _tmp41_;
+	GtkRadioButton* _tmp42_;
+	GtkRadioButton* _tmp43_;
+	GtkEntry* _tmp44_;
+	GtkComboBoxText* _tmp45_;
+	gint _tmp46_;
+	PublishingPiwigoPermissionLevel** _tmp47_;
+	gint _tmp48_;
+	PublishingPiwigoSizeEntry** _tmp49_;
+	GtkTextView* _tmp50_;
+	GtkTextBuffer* _tmp51_;
+	GtkTextBuffer* _tmp52_;
+	const gchar* _tmp53_;
 #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
 #line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8686,123 +8693,118 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
 	gtk_text_buffer_set_text (_tmp52_, _tmp53_, -1);
 #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (builder);
-#line 8676 "PiwigoPublishing.c"
+#line 8683 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8687 "PiwigoPublishing.c"
+#line 8694 "PiwigoPublishing.c"
 	}
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8693 "PiwigoPublishing.c"
+#line 8700 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8704 "PiwigoPublishing.c"
+#line 8711 "PiwigoPublishing.c"
 	}
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8710 "PiwigoPublishing.c"
+#line 8717 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8721 "PiwigoPublishing.c"
+#line 8728 "PiwigoPublishing.c"
 	}
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8727 "PiwigoPublishing.c"
+#line 8734 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8738 "PiwigoPublishing.c"
+#line 8745 "PiwigoPublishing.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8744 "PiwigoPublishing.c"
+#line 8751 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add40 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8755 "PiwigoPublishing.c"
+#line 8762 "PiwigoPublishing.c"
 	}
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8761 "PiwigoPublishing.c"
+#line 8768 "PiwigoPublishing.c"
 }
 
 
 static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) {
 	PublishingPiwigoPermissionLevel** result = NULL;
 	PublishingPiwigoPermissionLevel** _result_ = NULL;
-	PublishingPiwigoPermissionLevel** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingPiwigoPermissionLevel** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp3_ = NULL;
-	PublishingPiwigoPermissionLevel** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp6_ = NULL;
-	PublishingPiwigoPermissionLevel** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp9_ = NULL;
-	PublishingPiwigoPermissionLevel** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	const gchar* _tmp11_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp12_ = NULL;
-	PublishingPiwigoPermissionLevel** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	const gchar* _tmp14_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp15_ = NULL;
-	PublishingPiwigoPermissionLevel** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	PublishingPiwigoPermissionLevel** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingPiwigoPermissionLevel** _tmp1_;
+	gint _tmp1__length1;
+	PublishingPiwigoPermissionLevel* _tmp2_;
+	PublishingPiwigoPermissionLevel** _tmp3_;
+	gint _tmp3__length1;
+	PublishingPiwigoPermissionLevel* _tmp4_;
+	PublishingPiwigoPermissionLevel** _tmp5_;
+	gint _tmp5__length1;
+	PublishingPiwigoPermissionLevel* _tmp6_;
+	PublishingPiwigoPermissionLevel** _tmp7_;
+	gint _tmp7__length1;
+	PublishingPiwigoPermissionLevel* _tmp8_;
+	PublishingPiwigoPermissionLevel** _tmp9_;
+	gint _tmp9__length1;
+	PublishingPiwigoPermissionLevel* _tmp10_;
+	PublishingPiwigoPermissionLevel** _tmp11_;
+	gint _tmp11__length1;
 #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8818,182 +8820,167 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = _ ("Everyone");
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = publishing_piwigo_permission_level_new (0, _tmp2_);
+	_tmp2_ = publishing_piwigo_permission_level_new (0, _ ("Everyone"));
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _result_;
+	_tmp3_ = _result_;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3__length1 = _result__length1;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = _ ("Admins, Family, Friends, Contacts");
+	_tmp4_ = publishing_piwigo_permission_level_new (1, _ ("Admins, Family, Friends, Contacts"));
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = publishing_piwigo_permission_level_new (1, _tmp5_);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = _result_;
+	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5_ = _result_;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = _ ("Admins, Family, Friends");
+	_tmp5__length1 = _result__length1;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = publishing_piwigo_permission_level_new (2, _tmp8_);
+	_tmp6_ = publishing_piwigo_permission_level_new (2, _ ("Admins, Family, Friends"));
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = _result_;
+	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7_ = _result_;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = _ ("Admins, Family");
+	_tmp7__length1 = _result__length1;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = publishing_piwigo_permission_level_new (4, _tmp11_);
+	_tmp8_ = publishing_piwigo_permission_level_new (4, _ ("Admins, Family"));
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = _result_;
+	_tmp9_ = _result_;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13__length1 = _result__length1;
+	_tmp9__length1 = _result__length1;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = _ ("Admins");
+	_tmp10_ = publishing_piwigo_permission_level_new (8, _ ("Admins"));
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = publishing_piwigo_permission_level_new (8, _tmp14_);
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = _result_;
+	_tmp11_ = _result_;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16__length1 = _result__length1;
+	_tmp11__length1 = _result__length1;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (result_length1) {
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		*result_length1 = _tmp16__length1;
-#line 8861 "PiwigoPublishing.c"
+		*result_length1 = _tmp11__length1;
+#line 8853 "PiwigoPublishing.c"
 	}
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp16_;
+	result = _tmp11_;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8867 "PiwigoPublishing.c"
+#line 8859 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8878 "PiwigoPublishing.c"
+#line 8870 "PiwigoPublishing.c"
 	}
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8884 "PiwigoPublishing.c"
+#line 8876 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8895 "PiwigoPublishing.c"
+#line 8887 "PiwigoPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8901 "PiwigoPublishing.c"
+#line 8893 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8912 "PiwigoPublishing.c"
+#line 8904 "PiwigoPublishing.c"
 	}
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8918 "PiwigoPublishing.c"
+#line 8910 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8929 "PiwigoPublishing.c"
+#line 8921 "PiwigoPublishing.c"
 	}
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8935 "PiwigoPublishing.c"
+#line 8927 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add45 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8946 "PiwigoPublishing.c"
+#line 8938 "PiwigoPublishing.c"
 	}
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8952 "PiwigoPublishing.c"
+#line 8944 "PiwigoPublishing.c"
 }
 
 
 static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) {
 	PublishingPiwigoSizeEntry** result = NULL;
 	PublishingPiwigoSizeEntry** _result_ = NULL;
-	PublishingPiwigoSizeEntry** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingPiwigoSizeEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp3_ = NULL;
-	PublishingPiwigoSizeEntry** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp6_ = NULL;
-	PublishingPiwigoSizeEntry** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp9_ = NULL;
-	PublishingPiwigoSizeEntry** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	const gchar* _tmp11_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp12_ = NULL;
-	PublishingPiwigoSizeEntry** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	const gchar* _tmp14_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp15_ = NULL;
-	PublishingPiwigoSizeEntry** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	PublishingPiwigoSizeEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingPiwigoSizeEntry** _tmp1_;
+	gint _tmp1__length1;
+	PublishingPiwigoSizeEntry* _tmp2_;
+	PublishingPiwigoSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingPiwigoSizeEntry* _tmp4_;
+	PublishingPiwigoSizeEntry** _tmp5_;
+	gint _tmp5__length1;
+	PublishingPiwigoSizeEntry* _tmp6_;
+	PublishingPiwigoSizeEntry** _tmp7_;
+	gint _tmp7__length1;
+	PublishingPiwigoSizeEntry* _tmp8_;
+	PublishingPiwigoSizeEntry** _tmp9_;
+	gint _tmp9__length1;
+	PublishingPiwigoSizeEntry* _tmp10_;
+	PublishingPiwigoSizeEntry** _tmp11_;
+	gint _tmp11__length1;
 #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9009,66 +8996,56 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = _ ("500 × 375 pixels");
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = publishing_piwigo_size_entry_new (500, _tmp2_);
+	_tmp2_ = publishing_piwigo_size_entry_new (500, _ ("500 × 375 pixels"));
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _result_;
+	_tmp3_ = _result_;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3__length1 = _result__length1;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = _ ("1024 × 768 pixels");
+	_tmp4_ = publishing_piwigo_size_entry_new (1024, _ ("1024 × 768 pixels"));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = publishing_piwigo_size_entry_new (1024, _tmp5_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = _result_;
+	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5_ = _result_;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = _ ("2048 × 1536 pixels");
+	_tmp5__length1 = _result__length1;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = publishing_piwigo_size_entry_new (2048, _tmp8_);
+	_tmp6_ = publishing_piwigo_size_entry_new (2048, _ ("2048 × 1536 pixels"));
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = _result_;
+	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7_ = _result_;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = _ ("4096 × 3072 pixels");
+	_tmp7__length1 = _result__length1;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = publishing_piwigo_size_entry_new (4096, _tmp11_);
+	_tmp8_ = publishing_piwigo_size_entry_new (4096, _ ("4096 × 3072 pixels"));
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = _result_;
+	_tmp9_ = _result_;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13__length1 = _result__length1;
+	_tmp9__length1 = _result__length1;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = _ ("Original size");
+	_tmp10_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _ ("Original size"));
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _tmp14_);
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = _result_;
+	_tmp11_ = _result_;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16__length1 = _result__length1;
+	_tmp11__length1 = _result__length1;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (result_length1) {
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		*result_length1 = _tmp16__length1;
-#line 9052 "PiwigoPublishing.c"
+		*result_length1 = _tmp11__length1;
+#line 9029 "PiwigoPublishing.c"
 	}
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp16_;
+	result = _tmp11_;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9058 "PiwigoPublishing.c"
+#line 9035 "PiwigoPublishing.c"
 }
 
 
@@ -9076,53 +9053,53 @@ static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 9067 "PiwigoPublishing.c"
+	g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 9044 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_piwigo_permission_level_ref0 (gpointer self) {
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_permission_level_ref (self) : NULL;
-#line 9074 "PiwigoPublishing.c"
+#line 9051 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_piwigo_size_entry_ref0 (gpointer self) {
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_size_entry_ref (self) : NULL;
-#line 9081 "PiwigoPublishing.c"
+#line 9058 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
 	PublishingPiwigoPublishingParameters* params = NULL;
-	PublishingPiwigoPublishingParameters* _tmp0_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp1_ = NULL;
-	PublishingPiwigoPermissionLevel** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	GtkComboBoxText* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	PublishingPiwigoPermissionLevel* _tmp5_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp6_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp7_ = NULL;
-	PublishingPiwigoSizeEntry** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GtkComboBoxText* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	PublishingPiwigoSizeEntry* _tmp11_ = NULL;
-	PublishingPiwigoSizeEntry* _tmp12_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp13_ = NULL;
-	GtkCheckButton* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	PublishingPiwigoPublishingParameters* _tmp16_ = NULL;
-	GtkCheckButton* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	GtkRadioButton* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	PublishingPiwigoPublishingParameters* _tmp53_ = NULL;
-	GtkCheckButton* _tmp54_ = NULL;
-	gboolean _tmp55_ = FALSE;
+	PublishingPiwigoPublishingParameters* _tmp0_;
+	PublishingPiwigoPublishingParameters* _tmp1_;
+	PublishingPiwigoPermissionLevel** _tmp2_;
+	gint _tmp2__length1;
+	GtkComboBoxText* _tmp3_;
+	gint _tmp4_;
+	PublishingPiwigoPermissionLevel* _tmp5_;
+	PublishingPiwigoPermissionLevel* _tmp6_;
+	PublishingPiwigoPublishingParameters* _tmp7_;
+	PublishingPiwigoSizeEntry** _tmp8_;
+	gint _tmp8__length1;
+	GtkComboBoxText* _tmp9_;
+	gint _tmp10_;
+	PublishingPiwigoSizeEntry* _tmp11_;
+	PublishingPiwigoSizeEntry* _tmp12_;
+	PublishingPiwigoPublishingParameters* _tmp13_;
+	GtkCheckButton* _tmp14_;
+	gboolean _tmp15_;
+	PublishingPiwigoPublishingParameters* _tmp16_;
+	GtkCheckButton* _tmp17_;
+	gboolean _tmp18_;
+	GtkRadioButton* _tmp19_;
+	gboolean _tmp20_;
+	PublishingPiwigoPublishingParameters* _tmp53_;
+	GtkCheckButton* _tmp54_;
+	gboolean _tmp55_;
 #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9187,20 +9164,20 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 	_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp20_) {
-#line 9177 "PiwigoPublishing.c"
+#line 9154 "PiwigoPublishing.c"
 		gchar* uploadcomment = NULL;
-		GtkTextView* _tmp21_ = NULL;
-		GtkTextBuffer* _tmp22_ = NULL;
-		GtkTextBuffer* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
+		GtkTextView* _tmp21_;
+		GtkTextBuffer* _tmp22_;
+		GtkTextBuffer* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
+		gchar* _tmp27_;
+		gchar* _tmp28_;
 		gint a = 0;
-		GtkComboBoxText* _tmp29_ = NULL;
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
+		GtkComboBoxText* _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = self->priv->album_comment;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9231,12 +9208,12 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 		_tmp31_ = a;
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp31_ == 0) {
-#line 9221 "PiwigoPublishing.c"
-			PublishingPiwigoPublishingParameters* _tmp32_ = NULL;
-			GtkEntry* _tmp33_ = NULL;
-			const gchar* _tmp34_ = NULL;
-			const gchar* _tmp35_ = NULL;
-			PublishingPiwigoCategory* _tmp36_ = NULL;
+#line 9198 "PiwigoPublishing.c"
+			PublishingPiwigoPublishingParameters* _tmp32_;
+			GtkEntry* _tmp33_;
+			const gchar* _tmp34_;
+			const gchar* _tmp35_;
+			PublishingPiwigoCategory* _tmp36_;
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp32_ = params;
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9251,19 +9228,19 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 			_publishing_piwigo_category_unref0 (_tmp32_->category);
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp32_->category = _tmp36_;
-#line 9241 "PiwigoPublishing.c"
+#line 9218 "PiwigoPublishing.c"
 		} else {
-			gint _tmp37_ = 0;
-			PublishingPiwigoPublishingParameters* _tmp38_ = NULL;
-			GtkEntry* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			GeeList* _tmp41_ = NULL;
-			gint _tmp42_ = 0;
-			gpointer _tmp43_ = NULL;
-			PublishingPiwigoCategory* _tmp44_ = NULL;
-			gint _tmp45_ = 0;
-			const gchar* _tmp46_ = NULL;
-			PublishingPiwigoCategory* _tmp47_ = NULL;
+			gint _tmp37_;
+			PublishingPiwigoPublishingParameters* _tmp38_;
+			GtkEntry* _tmp39_;
+			const gchar* _tmp40_;
+			GeeList* _tmp41_;
+			gint _tmp42_;
+			gpointer _tmp43_;
+			PublishingPiwigoCategory* _tmp44_;
+			gint _tmp45_;
+			const gchar* _tmp46_;
+			PublishingPiwigoCategory* _tmp47_;
 #line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp37_ = a;
 #line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9294,17 +9271,17 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 			_tmp38_->category = _tmp47_;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (_tmp44_);
-#line 9284 "PiwigoPublishing.c"
+#line 9261 "PiwigoPublishing.c"
 		}
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (uploadcomment);
-#line 9288 "PiwigoPublishing.c"
+#line 9265 "PiwigoPublishing.c"
 	} else {
-		PublishingPiwigoPublishingParameters* _tmp48_ = NULL;
-		GeeList* _tmp49_ = NULL;
-		GtkComboBoxText* _tmp50_ = NULL;
-		gint _tmp51_ = 0;
-		gpointer _tmp52_ = NULL;
+		PublishingPiwigoPublishingParameters* _tmp48_;
+		GeeList* _tmp49_;
+		GtkComboBoxText* _tmp50_;
+		gint _tmp51_;
+		gpointer _tmp52_;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp48_ = params;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9319,7 +9296,7 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 		_publishing_piwigo_category_unref0 (_tmp48_->category);
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp48_->category = (PublishingPiwigoCategory*) _tmp52_;
-#line 9309 "PiwigoPublishing.c"
+#line 9286 "PiwigoPublishing.c"
 	}
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp53_ = params;
@@ -9328,21 +9305,21 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp55_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_emit_by_name (self, "publish", _tmp53_, _tmp55_);
+	g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp53_, _tmp55_);
 #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (params);
-#line 9321 "PiwigoPublishing.c"
+#line 9298 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GtkComboBoxText* _tmp3_ = NULL;
-	GtkComboBoxText* _tmp4_ = NULL;
-	GtkLabel* _tmp5_ = NULL;
-	GtkTextView* _tmp6_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	GtkEntry* _tmp1_;
+	GtkLabel* _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	GtkLabel* _tmp5_;
+	GtkTextView* _tmp6_;
 #line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9375,18 +9352,18 @@ static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clic
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9365 "PiwigoPublishing.c"
+#line 9342 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	GtkLabel* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	GtkTextView* _tmp4_ = NULL;
-	GtkComboBoxText* _tmp5_ = NULL;
-	GtkEntry* _tmp6_ = NULL;
+	GtkEntry* _tmp0_;
+	GtkLabel* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	GtkLabel* _tmp3_;
+	GtkTextView* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	GtkEntry* _tmp6_;
 #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9419,7 +9396,7 @@ static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicke
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9409 "PiwigoPublishing.c"
+#line 9386 "PiwigoPublishing.c"
 }
 
 
@@ -9428,7 +9405,7 @@ static void publishing_piwigo_publishing_options_pane_on_new_category_entry_chan
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9418 "PiwigoPublishing.c"
+#line 9395 "PiwigoPublishing.c"
 }
 
 
@@ -9437,24 +9414,24 @@ static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9427 "PiwigoPublishing.c"
+#line 9404 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self) {
 	gchar* category_name = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gint a = 0;
-	GtkComboBoxText* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	GtkComboBoxText* _tmp3_;
+	gint _tmp4_;
 	gchar* search_name = NULL;
-	gint _tmp5_ = 0;
+	gint _tmp5_;
 	gboolean _tmp18_ = FALSE;
-	GtkRadioButton* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	GtkButton* _tmp25_ = NULL;
+	GtkRadioButton* _tmp19_;
+	gboolean _tmp20_;
+	GtkButton* _tmp25_;
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9475,9 +9452,9 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 	_tmp5_ = a;
 #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_ <= 0) {
-#line 9465 "PiwigoPublishing.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 9442 "PiwigoPublishing.c"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = category_name;
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9486,18 +9463,18 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 		_g_free0 (search_name);
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		search_name = _tmp7_;
-#line 9476 "PiwigoPublishing.c"
+#line 9453 "PiwigoPublishing.c"
 	} else {
-		gint _tmp8_ = 0;
-		GeeList* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gpointer _tmp11_ = NULL;
-		PublishingPiwigoCategory* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+		gint _tmp8_;
+		GeeList* _tmp9_;
+		gint _tmp10_;
+		gpointer _tmp11_;
+		PublishingPiwigoCategory* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = a;
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9528,7 +9505,7 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 		_g_free0 (_tmp15_);
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_piwigo_category_unref0 (_tmp12_);
-#line 9518 "PiwigoPublishing.c"
+#line 9495 "PiwigoPublishing.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = self->priv->create_new_radio;
@@ -9536,34 +9513,34 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 	_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp20_) {
-#line 9526 "PiwigoPublishing.c"
+#line 9503 "PiwigoPublishing.c"
 		gboolean _tmp21_ = FALSE;
-		const gchar* _tmp22_ = NULL;
+		const gchar* _tmp22_;
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp22_ = category_name;
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_strcmp0 (_tmp22_, "") == 0) {
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp21_ = TRUE;
-#line 9535 "PiwigoPublishing.c"
+#line 9512 "PiwigoPublishing.c"
 		} else {
-			const gchar* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
+			const gchar* _tmp23_;
+			gboolean _tmp24_;
 #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp23_ = search_name;
 #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp24_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp23_);
 #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp21_ = _tmp24_;
-#line 9545 "PiwigoPublishing.c"
+#line 9522 "PiwigoPublishing.c"
 		}
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = _tmp21_;
-#line 9549 "PiwigoPublishing.c"
+#line 9526 "PiwigoPublishing.c"
 	} else {
 #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = FALSE;
-#line 9553 "PiwigoPublishing.c"
+#line 9530 "PiwigoPublishing.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp25_ = self->priv->publish_button;
@@ -9573,13 +9550,13 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 	_g_free0 (search_name);
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (category_name);
-#line 9563 "PiwigoPublishing.c"
+#line 9540 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
 	PublishingPiwigoPublishingOptionsPane * self;
-	GtkButton* _tmp0_ = NULL;
+	GtkButton* _tmp0_;
 #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
 #line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9598,28 +9575,28 @@ static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (Sh
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9588 "PiwigoPublishing.c"
+#line 9565 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher) {
 	gchar* result = NULL;
 	SpitPublishingPublishable** publishables = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	SpitPublishingPublishable** _tmp4_ = NULL;
-	SpitPublishingPublishable** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	PublishingPiwigoPiwigoPublisher* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	gint _tmp3_;
+	SpitPublishingPublishable** _tmp4_;
+	SpitPublishingPublishable** _tmp5_;
+	gint _tmp5__length1;
+	gint publishables_length1;
+	gint _publishables_size_;
 	gchar* common = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp6_;
 	gboolean isfirst = FALSE;
-	SpitPublishingPublishable** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp19_ = NULL;
+	SpitPublishingPublishable** _tmp7_;
+	gint _tmp7__length1;
+	const gchar* _tmp19_;
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9654,14 +9631,14 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 	_tmp7__length1 = publishables_length1;
 #line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 9644 "PiwigoPublishing.c"
-		SpitPublishingPublishable** _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
+#line 9621 "PiwigoPublishing.c"
+		SpitPublishingPublishable** _tmp8_;
+		gint _tmp8__length1;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = publishables;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8__length1 = publishables_length1;
-#line 9651 "PiwigoPublishing.c"
+#line 9628 "PiwigoPublishing.c"
 		{
 			SpitPublishingPublishable** pub_collection = NULL;
 			gint pub_collection_length1 = 0;
@@ -9673,20 +9650,20 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 			pub_collection_length1 = _tmp8__length1;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			for (pub_it = 0; pub_it < _tmp8__length1; pub_it = pub_it + 1) {
-#line 9663 "PiwigoPublishing.c"
-				SpitPublishingPublishable* _tmp9_ = NULL;
+#line 9640 "PiwigoPublishing.c"
+				SpitPublishingPublishable* _tmp9_;
 				SpitPublishingPublishable* pub = NULL;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp9_ = _g_object_ref0 (pub_collection[pub_it]);
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				pub = _tmp9_;
-#line 9670 "PiwigoPublishing.c"
+#line 9647 "PiwigoPublishing.c"
 				{
 					gchar* cur = NULL;
-					SpitPublishingPublishable* _tmp10_ = NULL;
-					gchar* _tmp11_ = NULL;
-					const gchar* _tmp12_ = NULL;
-					gboolean _tmp13_ = FALSE;
+					SpitPublishingPublishable* _tmp10_;
+					gchar* _tmp11_;
+					const gchar* _tmp12_;
+					gboolean _tmp13_;
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp10_ = pub;
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9703,15 +9680,15 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 						_g_object_unref0 (pub);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						continue;
-#line 9693 "PiwigoPublishing.c"
+#line 9670 "PiwigoPublishing.c"
 					}
 #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp13_ = isfirst;
 #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_tmp13_) {
-#line 9699 "PiwigoPublishing.c"
-						const gchar* _tmp14_ = NULL;
-						gchar* _tmp15_ = NULL;
+#line 9676 "PiwigoPublishing.c"
+						const gchar* _tmp14_;
+						gchar* _tmp15_;
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp14_ = cur;
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9722,18 +9699,18 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 						common = _tmp15_;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						isfirst = FALSE;
-#line 9712 "PiwigoPublishing.c"
+#line 9689 "PiwigoPublishing.c"
 					} else {
-						const gchar* _tmp16_ = NULL;
-						const gchar* _tmp17_ = NULL;
+						const gchar* _tmp16_;
+						const gchar* _tmp17_;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp16_ = cur;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp17_ = common;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						if (g_strcmp0 (_tmp16_, _tmp17_) != 0) {
-#line 9722 "PiwigoPublishing.c"
-							gchar* _tmp18_ = NULL;
+#line 9699 "PiwigoPublishing.c"
+							gchar* _tmp18_;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp18_ = g_strdup ("");
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9746,14 +9723,14 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 							_g_object_unref0 (pub);
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							break;
-#line 9736 "PiwigoPublishing.c"
+#line 9713 "PiwigoPublishing.c"
 						}
 					}
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (cur);
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (pub);
-#line 9743 "PiwigoPublishing.c"
+#line 9720 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -9769,27 +9746,27 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9758 "PiwigoPublishing.c"
+#line 9735 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
-	GeeList* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	const gchar* _tmp30_ = NULL;
-	gboolean _tmp31_ = FALSE;
+	GeeList* _tmp14_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
+	const gchar* _tmp30_;
+	gboolean _tmp31_;
 #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 9770 "PiwigoPublishing.c"
+#line 9747 "PiwigoPublishing.c"
 	{
 		GeeList* _cat_list = NULL;
-		GeeList* _tmp0_ = NULL;
-		GeeList* _tmp1_ = NULL;
+		GeeList* _tmp0_;
+		GeeList* _tmp1_;
 		gint _cat_size = 0;
-		GeeList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _cat_index = 0;
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = self->priv->_existing_categories;
@@ -9809,17 +9786,17 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 		_cat_index = -1;
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		while (TRUE) {
-#line 9798 "PiwigoPublishing.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 9775 "PiwigoPublishing.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			PublishingPiwigoCategory* cat = NULL;
-			GeeList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			GtkComboBoxText* _tmp11_ = NULL;
-			PublishingPiwigoCategory* _tmp12_ = NULL;
-			const gchar* _tmp13_ = NULL;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			GtkComboBoxText* _tmp11_;
+			PublishingPiwigoCategory* _tmp12_;
+			const gchar* _tmp13_;
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp5_ = _cat_index;
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9832,7 +9809,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 			if (!(_tmp6_ < _tmp7_)) {
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 9821 "PiwigoPublishing.c"
+#line 9798 "PiwigoPublishing.c"
 			}
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp8_ = _cat_list;
@@ -9852,11 +9829,11 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 			gtk_combo_box_text_append_text (_tmp11_, _tmp13_);
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (cat);
-#line 9841 "PiwigoPublishing.c"
+#line 9818 "PiwigoPublishing.c"
 		}
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_cat_list);
-#line 9845 "PiwigoPublishing.c"
+#line 9822 "PiwigoPublishing.c"
 	}
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = self->priv->_existing_categories;
@@ -9866,13 +9843,13 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 	_tmp16_ = _tmp15_;
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp16_) {
-#line 9855 "PiwigoPublishing.c"
-		GtkComboBoxText* _tmp17_ = NULL;
-		GtkRadioButton* _tmp18_ = NULL;
-		GtkRadioButton* _tmp19_ = NULL;
-		GtkTextView* _tmp20_ = NULL;
-		GtkLabel* _tmp21_ = NULL;
-		GtkEntry* _tmp22_ = NULL;
+#line 9832 "PiwigoPublishing.c"
+		GtkComboBoxText* _tmp17_;
+		GtkRadioButton* _tmp18_;
+		GtkRadioButton* _tmp19_;
+		GtkTextView* _tmp20_;
+		GtkLabel* _tmp21_;
+		GtkEntry* _tmp22_;
 #line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = self->priv->existing_categories_combo;
 #line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9897,16 +9874,16 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 		_tmp22_ = self->priv->new_category_entry;
 #line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 9886 "PiwigoPublishing.c"
+#line 9863 "PiwigoPublishing.c"
 	} else {
 		gint last_category_index = 0;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		GtkComboBoxText* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
-		GtkEntry* _tmp27_ = NULL;
-		GtkTextView* _tmp28_ = NULL;
-		GtkLabel* _tmp29_ = NULL;
+		gint _tmp23_;
+		gint _tmp24_;
+		GtkComboBoxText* _tmp25_;
+		gint _tmp26_;
+		GtkEntry* _tmp27_;
+		GtkTextView* _tmp28_;
+		GtkLabel* _tmp29_;
 #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = self->priv->_last_category;
 #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9931,7 +9908,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 		_tmp29_ = self->priv->album_comment_label;
 #line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 9920 "PiwigoPublishing.c"
+#line 9897 "PiwigoPublishing.c"
 	}
 #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp30_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
@@ -9939,40 +9916,40 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 	_tmp31_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp30_);
 #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp31_) {
-#line 9928 "PiwigoPublishing.c"
-		GtkEntry* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
+#line 9905 "PiwigoPublishing.c"
+		GtkEntry* _tmp32_;
+		const gchar* _tmp33_;
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp32_ = self->priv->new_category_entry;
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp33_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_entry_set_text (_tmp32_, _tmp33_);
-#line 9937 "PiwigoPublishing.c"
+#line 9914 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	GtkLabel* _tmp15_ = NULL;
-	GtkComboBoxText* _tmp16_ = NULL;
-	GtkComboBoxText* _tmp17_ = NULL;
+	GtkComboBoxText* _tmp0_;
+	GtkLabel* _tmp15_;
+	GtkComboBoxText* _tmp16_;
+	GtkComboBoxText* _tmp17_;
 #line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->within_existing_combo;
 #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_combo_box_text_append_text (_tmp0_, "/ ");
-#line 9953 "PiwigoPublishing.c"
+#line 9930 "PiwigoPublishing.c"
 	{
 		GeeList* _cat_list = NULL;
-		GeeList* _tmp1_ = NULL;
-		GeeList* _tmp2_ = NULL;
+		GeeList* _tmp1_;
+		GeeList* _tmp2_;
 		gint _cat_size = 0;
-		GeeList* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeList* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 		gint _cat_index = 0;
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = self->priv->_existing_categories;
@@ -9992,17 +9969,17 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 		_cat_index = -1;
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		while (TRUE) {
-#line 9981 "PiwigoPublishing.c"
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+#line 9958 "PiwigoPublishing.c"
+			gint _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			PublishingPiwigoCategory* cat = NULL;
-			GeeList* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
-			gpointer _tmp11_ = NULL;
-			GtkComboBoxText* _tmp12_ = NULL;
-			PublishingPiwigoCategory* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
+			GeeList* _tmp9_;
+			gint _tmp10_;
+			gpointer _tmp11_;
+			GtkComboBoxText* _tmp12_;
+			PublishingPiwigoCategory* _tmp13_;
+			const gchar* _tmp14_;
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = _cat_index;
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10015,7 +9992,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 			if (!(_tmp7_ < _tmp8_)) {
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 10004 "PiwigoPublishing.c"
+#line 9981 "PiwigoPublishing.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = _cat_list;
@@ -10035,11 +10012,11 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 			gtk_combo_box_text_append_text (_tmp12_, _tmp14_);
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (cat);
-#line 10024 "PiwigoPublishing.c"
+#line 10001 "PiwigoPublishing.c"
 		}
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_cat_list);
-#line 10028 "PiwigoPublishing.c"
+#line 10005 "PiwigoPublishing.c"
 	}
 #line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = self->priv->within_existing_label;
@@ -10053,24 +10030,24 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 	_tmp17_ = self->priv->within_existing_combo;
 #line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10042 "PiwigoPublishing.c"
+#line 10019 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self) {
-	PublishingPiwigoPermissionLevel** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingPiwigoPermissionLevel** _tmp0_;
+	gint _tmp0__length1;
 	gint last_permission_level_index = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->perm_levels;
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->perm_levels_length1;
-#line 10059 "PiwigoPublishing.c"
+#line 10036 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoPermissionLevel** perm_collection = NULL;
 		gint perm_collection_length1 = 0;
@@ -10082,18 +10059,18 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
 		perm_collection_length1 = _tmp0__length1;
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) {
-#line 10071 "PiwigoPublishing.c"
-			PublishingPiwigoPermissionLevel* _tmp1_ = NULL;
+#line 10048 "PiwigoPublishing.c"
+			PublishingPiwigoPermissionLevel* _tmp1_;
 			PublishingPiwigoPermissionLevel* perm = NULL;
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]);
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			perm = _tmp1_;
-#line 10078 "PiwigoPublishing.c"
+#line 10055 "PiwigoPublishing.c"
 			{
-				GtkComboBoxText* _tmp2_ = NULL;
-				PublishingPiwigoPermissionLevel* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
+				GtkComboBoxText* _tmp2_;
+				PublishingPiwigoPermissionLevel* _tmp3_;
+				const gchar* _tmp4_;
 #line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = self->priv->perms_combo;
 #line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10104,7 +10081,7 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_permission_level_unref0 (perm);
-#line 10093 "PiwigoPublishing.c"
+#line 10070 "PiwigoPublishing.c"
 			}
 		}
 	}
@@ -10118,41 +10095,41 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
 	_tmp7_ = last_permission_level_index;
 #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ < 0) {
-#line 10107 "PiwigoPublishing.c"
-		GtkComboBoxText* _tmp8_ = NULL;
+#line 10084 "PiwigoPublishing.c"
+		GtkComboBoxText* _tmp8_;
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->perms_combo;
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 10113 "PiwigoPublishing.c"
+#line 10090 "PiwigoPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
+		GtkComboBoxText* _tmp9_;
+		gint _tmp10_;
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = self->priv->perms_combo;
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = last_permission_level_index;
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 10123 "PiwigoPublishing.c"
+#line 10100 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self) {
-	PublishingPiwigoSizeEntry** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingPiwigoSizeEntry** _tmp0_;
+	gint _tmp0__length1;
 	gint last_size_index = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->photo_sizes;
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->photo_sizes_length1;
-#line 10141 "PiwigoPublishing.c"
+#line 10118 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoSizeEntry** size_collection = NULL;
 		gint size_collection_length1 = 0;
@@ -10164,18 +10141,18 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
 		size_collection_length1 = _tmp0__length1;
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) {
-#line 10153 "PiwigoPublishing.c"
-			PublishingPiwigoSizeEntry* _tmp1_ = NULL;
+#line 10130 "PiwigoPublishing.c"
+			PublishingPiwigoSizeEntry* _tmp1_;
 			PublishingPiwigoSizeEntry* size = NULL;
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]);
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			size = _tmp1_;
-#line 10160 "PiwigoPublishing.c"
+#line 10137 "PiwigoPublishing.c"
 			{
-				GtkComboBoxText* _tmp2_ = NULL;
-				PublishingPiwigoSizeEntry* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
+				GtkComboBoxText* _tmp2_;
+				PublishingPiwigoSizeEntry* _tmp3_;
+				const gchar* _tmp4_;
 #line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = self->priv->size_combo;
 #line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10186,7 +10163,7 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_size_entry_unref0 (size);
-#line 10175 "PiwigoPublishing.c"
+#line 10152 "PiwigoPublishing.c"
 			}
 		}
 	}
@@ -10200,26 +10177,26 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
 	_tmp7_ = last_size_index;
 #line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ < 0) {
-#line 10189 "PiwigoPublishing.c"
-		GtkComboBoxText* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
+#line 10166 "PiwigoPublishing.c"
+		GtkComboBoxText* _tmp8_;
+		gint _tmp9_;
 #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->size_combo;
 #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE);
 #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
-#line 10198 "PiwigoPublishing.c"
+#line 10175 "PiwigoPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
+		GtkComboBoxText* _tmp10_;
+		gint _tmp11_;
 #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = self->priv->size_combo;
 #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = last_size_index;
 #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_);
-#line 10208 "PiwigoPublishing.c"
+#line 10185 "PiwigoPublishing.c"
 	}
 }
 
@@ -10231,39 +10208,39 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = 0;
-#line 10220 "PiwigoPublishing.c"
+#line 10197 "PiwigoPublishing.c"
 	{
 		gint i = 0;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10225 "PiwigoPublishing.c"
+#line 10202 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10232 "PiwigoPublishing.c"
-				gint _tmp2_ = 0;
-				GeeList* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
-				GeeList* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gpointer _tmp8_ = NULL;
-				PublishingPiwigoCategory* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
-				gboolean _tmp12_ = FALSE;
+#line 10209 "PiwigoPublishing.c"
+				gint _tmp2_;
+				GeeList* _tmp3_;
+				gint _tmp4_;
+				gint _tmp5_;
+				GeeList* _tmp6_;
+				gint _tmp7_;
+				gpointer _tmp8_;
+				PublishingPiwigoCategory* _tmp9_;
+				gint _tmp10_;
+				gint _tmp11_;
+				gboolean _tmp12_;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10246 "PiwigoPublishing.c"
-					gint _tmp1_ = 0;
+#line 10223 "PiwigoPublishing.c"
+					gint _tmp1_;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10252 "PiwigoPublishing.c"
+#line 10229 "PiwigoPublishing.c"
 				}
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
@@ -10279,7 +10256,7 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 				if (!(_tmp2_ < _tmp5_)) {
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10268 "PiwigoPublishing.c"
+#line 10245 "PiwigoPublishing.c"
 				}
 #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = self->priv->_existing_categories;
@@ -10299,15 +10276,15 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 				_publishing_piwigo_category_unref0 (_tmp9_);
 #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp12_) {
-#line 10288 "PiwigoPublishing.c"
-					gint _tmp13_ = 0;
+#line 10265 "PiwigoPublishing.c"
+					gint _tmp13_;
 #line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp13_ = i;
 #line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp13_;
 #line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10296 "PiwigoPublishing.c"
+#line 10273 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -10316,7 +10293,7 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 	result = _result_;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10305 "PiwigoPublishing.c"
+#line 10282 "PiwigoPublishing.c"
 }
 
 
@@ -10327,37 +10304,37 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 10316 "PiwigoPublishing.c"
+#line 10293 "PiwigoPublishing.c"
 	{
 		gint i = 0;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10321 "PiwigoPublishing.c"
+#line 10298 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10328 "PiwigoPublishing.c"
-				gint _tmp2_ = 0;
-				PublishingPiwigoPermissionLevel** _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				PublishingPiwigoPermissionLevel** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				gint _tmp5_ = 0;
-				PublishingPiwigoPermissionLevel* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
+#line 10305 "PiwigoPublishing.c"
+				gint _tmp2_;
+				PublishingPiwigoPermissionLevel** _tmp3_;
+				gint _tmp3__length1;
+				PublishingPiwigoPermissionLevel** _tmp4_;
+				gint _tmp4__length1;
+				gint _tmp5_;
+				PublishingPiwigoPermissionLevel* _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10340 "PiwigoPublishing.c"
-					gint _tmp1_ = 0;
+#line 10317 "PiwigoPublishing.c"
+					gint _tmp1_;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10346 "PiwigoPublishing.c"
+#line 10323 "PiwigoPublishing.c"
 				}
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
@@ -10371,7 +10348,7 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 				if (!(_tmp2_ < _tmp3__length1)) {
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10360 "PiwigoPublishing.c"
+#line 10337 "PiwigoPublishing.c"
 				}
 #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->perm_levels;
@@ -10387,15 +10364,15 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 				_tmp8_ = permission_level_id;
 #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 10376 "PiwigoPublishing.c"
-					gint _tmp9_ = 0;
+#line 10353 "PiwigoPublishing.c"
+					gint _tmp9_;
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = i;
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp9_;
 #line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10384 "PiwigoPublishing.c"
+#line 10361 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -10404,7 +10381,7 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 	result = _result_;
 #line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10393 "PiwigoPublishing.c"
+#line 10370 "PiwigoPublishing.c"
 }
 
 
@@ -10415,37 +10392,37 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 10404 "PiwigoPublishing.c"
+#line 10381 "PiwigoPublishing.c"
 	{
 		gint i = 0;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10409 "PiwigoPublishing.c"
+#line 10386 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10416 "PiwigoPublishing.c"
-				gint _tmp2_ = 0;
-				PublishingPiwigoSizeEntry** _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				PublishingPiwigoSizeEntry** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				gint _tmp5_ = 0;
-				PublishingPiwigoSizeEntry* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
+#line 10393 "PiwigoPublishing.c"
+				gint _tmp2_;
+				PublishingPiwigoSizeEntry** _tmp3_;
+				gint _tmp3__length1;
+				PublishingPiwigoSizeEntry** _tmp4_;
+				gint _tmp4__length1;
+				gint _tmp5_;
+				PublishingPiwigoSizeEntry* _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10428 "PiwigoPublishing.c"
-					gint _tmp1_ = 0;
+#line 10405 "PiwigoPublishing.c"
+					gint _tmp1_;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10434 "PiwigoPublishing.c"
+#line 10411 "PiwigoPublishing.c"
 				}
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
@@ -10459,7 +10436,7 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 				if (!(_tmp2_ < _tmp3__length1)) {
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10448 "PiwigoPublishing.c"
+#line 10425 "PiwigoPublishing.c"
 				}
 #line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->photo_sizes;
@@ -10475,15 +10452,15 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 				_tmp8_ = size_id;
 #line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 10464 "PiwigoPublishing.c"
-					gint _tmp9_ = 0;
+#line 10441 "PiwigoPublishing.c"
+					gint _tmp9_;
 #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = i;
 #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp9_;
 #line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10472 "PiwigoPublishing.c"
+#line 10449 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -10492,7 +10469,7 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 	result = _result_;
 #line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10481 "PiwigoPublishing.c"
+#line 10458 "PiwigoPublishing.c"
 }
 
 
@@ -10505,15 +10482,15 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 	g_return_val_if_fail (category_name != NULL, FALSE);
 #line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = FALSE;
-#line 10494 "PiwigoPublishing.c"
+#line 10471 "PiwigoPublishing.c"
 	{
 		GeeList* _category_list = NULL;
-		GeeList* _tmp0_ = NULL;
-		GeeList* _tmp1_ = NULL;
+		GeeList* _tmp0_;
+		GeeList* _tmp1_;
 		gint _category_size = 0;
-		GeeList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _category_index = 0;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = self->priv->_existing_categories;
@@ -10533,20 +10510,20 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 		_category_index = -1;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		while (TRUE) {
-#line 10522 "PiwigoPublishing.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+#line 10499 "PiwigoPublishing.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			PublishingPiwigoCategory* category = NULL;
-			GeeList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			PublishingPiwigoCategory* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			PublishingPiwigoCategory* _tmp11_;
+			const gchar* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			const gchar* _tmp15_;
+			gboolean _tmp16_;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp5_ = _category_index;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10559,7 +10536,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 			if (!(_tmp6_ < _tmp7_)) {
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 10548 "PiwigoPublishing.c"
+#line 10525 "PiwigoPublishing.c"
 			}
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp8_ = _category_list;
@@ -10591,27 +10568,27 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 				_publishing_piwigo_category_unref0 (category);
 #line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 10580 "PiwigoPublishing.c"
+#line 10557 "PiwigoPublishing.c"
 			}
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (category);
-#line 10584 "PiwigoPublishing.c"
+#line 10561 "PiwigoPublishing.c"
 		}
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_category_list);
-#line 10588 "PiwigoPublishing.c"
+#line 10565 "PiwigoPublishing.c"
 	}
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10594 "PiwigoPublishing.c"
+#line 10571 "PiwigoPublishing.c"
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10620,27 +10597,31 @@ static gint publishing_piwigo_publishing_options_pane_get_last_category (Publish
 	result = _tmp0_;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10609 "PiwigoPublishing.c"
+#line 10586 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value) {
-	gint _tmp0_ = 0;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_publishing_options_pane_get_last_category (self) != value) {
+#line 10595 "PiwigoPublishing.c"
+		gint _tmp0_;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = value;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_last_category = _tmp0_;
+		self->priv->_last_category = _tmp0_;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "last-category");
-#line 10623 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "last-category");
+#line 10603 "PiwigoPublishing.c"
+	}
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10649,27 +10630,31 @@ static gint publishing_piwigo_publishing_options_pane_get_last_permission_level
 	result = _tmp0_;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10638 "PiwigoPublishing.c"
+#line 10619 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value) {
-	gint _tmp0_ = 0;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_publishing_options_pane_get_last_permission_level (self) != value) {
+#line 10628 "PiwigoPublishing.c"
+		gint _tmp0_;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_last_permission_level = _tmp0_;
+		_tmp0_ = value;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "last-permission-level");
-#line 10652 "PiwigoPublishing.c"
+		self->priv->_last_permission_level = _tmp0_;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_object_notify ((GObject *) self, "last-permission-level");
+#line 10636 "PiwigoPublishing.c"
+	}
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10678,27 +10663,31 @@ static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (Publi
 	result = _tmp0_;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10667 "PiwigoPublishing.c"
+#line 10652 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value) {
-	gint _tmp0_ = 0;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_publishing_options_pane_get_last_photo_size (self) != value) {
+#line 10661 "PiwigoPublishing.c"
+		gint _tmp0_;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_last_photo_size = _tmp0_;
+		_tmp0_ = value;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "last-photo-size");
-#line 10681 "PiwigoPublishing.c"
+		self->priv->_last_photo_size = _tmp0_;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_object_notify ((GObject *) self, "last-photo-size");
+#line 10669 "PiwigoPublishing.c"
+	}
 }
 
 
 static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10707,27 +10696,31 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comm
 	result = _tmp0_;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10696 "PiwigoPublishing.c"
+#line 10685 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self) != value) {
+#line 10694 "PiwigoPublishing.c"
+		gboolean _tmp0_;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_last_title_as_comment = _tmp0_;
+		_tmp0_ = value;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "last-title-as-comment");
-#line 10710 "PiwigoPublishing.c"
+		self->priv->_last_title_as_comment = _tmp0_;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_object_notify ((GObject *) self, "last-title-as-comment");
+#line 10702 "PiwigoPublishing.c"
+	}
 }
 
 
 static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10736,27 +10729,31 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tag
 	result = _tmp0_;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10725 "PiwigoPublishing.c"
+#line 10718 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self) != value) {
+#line 10727 "PiwigoPublishing.c"
+		gboolean _tmp0_;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = value;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_last_no_upload_tags = _tmp0_;
+		self->priv->_last_no_upload_tags = _tmp0_;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "last-no-upload-tags");
-#line 10739 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "last-no-upload-tags");
+#line 10735 "PiwigoPublishing.c"
+	}
 }
 
 
 static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10765,27 +10762,31 @@ static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_ena
 	result = _tmp0_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10754 "PiwigoPublishing.c"
+#line 10751 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self) != value) {
+#line 10760 "PiwigoPublishing.c"
+		gboolean _tmp0_;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = value;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_strip_metadata_enabled = _tmp0_;
+		self->priv->_strip_metadata_enabled = _tmp0_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "strip-metadata-enabled");
+		g_object_notify ((GObject *) self, "strip-metadata-enabled");
 #line 10768 "PiwigoPublishing.c"
+	}
 }
 
 
 static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self) {
 	GeeList* result;
-	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp0_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10794,32 +10795,36 @@ static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categorie
 	result = _tmp0_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10783 "PiwigoPublishing.c"
+#line 10784 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value) {
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (publishing_piwigo_publishing_options_pane_get_existing_categories (self) != value) {
+#line 10793 "PiwigoPublishing.c"
+		GeeList* _tmp0_;
+		GeeList* _tmp1_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->_existing_categories);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (self->priv->_existing_categories);
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_existing_categories = _tmp1_;
+		self->priv->_existing_categories = _tmp1_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "existing-categories");
-#line 10802 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "existing-categories");
+#line 10806 "PiwigoPublishing.c"
+	}
 }
 
 
 static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self) {
 	const gchar* result;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10828,26 +10833,30 @@ static const gchar* publishing_piwigo_publishing_options_pane_get_default_commen
 	result = _tmp0_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10817 "PiwigoPublishing.c"
+#line 10822 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = value;
+	if (g_strcmp0 (value, publishing_piwigo_publishing_options_pane_get_default_comment (self)) != 0) {
+#line 10831 "PiwigoPublishing.c"
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = value;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (self->priv->_default_comment);
+		_tmp1_ = g_strdup (_tmp0_);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_free0 (self->priv->_default_comment);
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_default_comment = _tmp1_;
+		self->priv->_default_comment = _tmp1_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_notify ((GObject *) self, "default-comment");
-#line 10836 "PiwigoPublishing.c"
+		g_object_notify ((GObject *) self, "default-comment");
+#line 10844 "PiwigoPublishing.c"
+	}
 }
 
 
@@ -10866,33 +10875,32 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER
 		data1 = closure->data;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10855 "PiwigoPublishing.c"
+#line 10864 "PiwigoPublishing.c"
 	} else {
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 10861 "PiwigoPublishing.c"
+#line 10870 "PiwigoPublishing.c"
 	}
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 10867 "PiwigoPublishing.c"
+#line 10876 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoPublishingOptionsPanePrivate));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_publishing_options_pane_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_piwigo_publishing_options_pane_real_constructed;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_installed;
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*) (ShotwellPluginsCommonBuilderPane *)) publishing_piwigo_publishing_options_pane_real_on_pane_installed;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_publishing_options_pane_get_property;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10900,32 +10908,30 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_publishing_options_pane_finalize;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN);
+	publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_new ("logout", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = _ ("Shotwell Connect");
+	publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (_ ("Shotwell Connect"));
 #line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp1_;
-#line 10914 "PiwigoPublishing.c"
+	publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp0_;
+#line 10920 "PiwigoPublishing.c"
 }
 
 
@@ -10938,11 +10944,11 @@ static void publishing_piwigo_publishing_options_pane_instance_init (PublishingP
 	self->priv->title_as_comment_check = NULL;
 #line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->no_upload_tags_check = NULL;
-#line 10927 "PiwigoPublishing.c"
+#line 10933 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) {
+static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj) {
 	PublishingPiwigoPublishingOptionsPane * self;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
@@ -10986,7 +10992,7 @@ static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) {
 	_g_free0 (self->priv->_default_comment);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj);
-#line 10975 "PiwigoPublishing.c"
+#line 10981 "PiwigoPublishing.c"
 }
 
 
@@ -11011,60 +11017,60 @@ static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObjec
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	switch (property_id) {
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_category (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_permission_level (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_photo_size (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_object (value, publishing_piwigo_publishing_options_pane_get_existing_categories (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_value_set_string (value, publishing_piwigo_publishing_options_pane_get_default_comment (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11047 "PiwigoPublishing.c"
+#line 11053 "PiwigoPublishing.c"
 		default:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11053 "PiwigoPublishing.c"
+#line 11059 "PiwigoPublishing.c"
 	}
 }
 
@@ -11075,60 +11081,60 @@ static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObjec
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	switch (property_id) {
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_last_category (self, g_value_get_int (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_last_permission_level (self, g_value_get_int (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_last_photo_size (self, g_value_get_int (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_last_title_as_comment (self, g_value_get_boolean (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (self, g_value_get_boolean (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (self, g_value_get_boolean (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_existing_categories (self, g_value_get_object (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT:
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_options_pane_set_default_comment (self, g_value_get_string (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11111 "PiwigoPublishing.c"
+#line 11117 "PiwigoPublishing.c"
 		default:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11117 "PiwigoPublishing.c"
+#line 11123 "PiwigoPublishing.c"
 	}
 }
 
@@ -11139,14 +11145,14 @@ PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type)
 	self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, "");
 #line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11128 "PiwigoPublishing.c"
+#line 11134 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSession* publishing_piwigo_session_new (void) {
 #line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION);
-#line 11135 "PiwigoPublishing.c"
+#line 11141 "PiwigoPublishing.c"
 }
 
 
@@ -11155,54 +11161,54 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp2_;
 #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->pwg_id;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 11151 "PiwigoPublishing.c"
-		const gchar* _tmp3_ = NULL;
+#line 11157 "PiwigoPublishing.c"
+		const gchar* _tmp3_;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = self->priv->pwg_url;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 11157 "PiwigoPublishing.c"
+#line 11163 "PiwigoPublishing.c"
 	} else {
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 11161 "PiwigoPublishing.c"
+#line 11167 "PiwigoPublishing.c"
 	}
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 11165 "PiwigoPublishing.c"
-		const gchar* _tmp4_ = NULL;
+#line 11171 "PiwigoPublishing.c"
+		const gchar* _tmp4_;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->username;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 11171 "PiwigoPublishing.c"
+#line 11177 "PiwigoPublishing.c"
 	} else {
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 11175 "PiwigoPublishing.c"
+#line 11181 "PiwigoPublishing.c"
 	}
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp0_;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11181 "PiwigoPublishing.c"
+#line 11187 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, const gchar* url, const gchar* username, const gchar* id) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
 #line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11235,7 +11241,7 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons
 	_g_free0 (self->priv->pwg_id);
 #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = _tmp5_;
-#line 11224 "PiwigoPublishing.c"
+#line 11230 "PiwigoPublishing.c"
 }
 
 
@@ -11254,14 +11260,14 @@ void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
 	_g_free0 (self->priv->username);
 #line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 11243 "PiwigoPublishing.c"
+#line 11249 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
 #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11272,14 +11278,14 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
 	result = _tmp1_;
 #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11261 "PiwigoPublishing.c"
+#line 11267 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11290,14 +11296,14 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
 	result = _tmp1_;
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11279 "PiwigoPublishing.c"
+#line 11285 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
 #line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11308,13 +11314,13 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
 	result = _tmp1_;
 #line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11297 "PiwigoPublishing.c"
+#line 11303 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11327,7 +11333,7 @@ void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const
 	_g_free0 (self->priv->pwg_id);
 #line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = _tmp1_;
-#line 11316 "PiwigoPublishing.c"
+#line 11322 "PiwigoPublishing.c"
 }
 
 
@@ -11339,8 +11345,8 @@ static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass *
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate));
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_piwigo_session_real_is_authenticated;
-#line 11329 "PiwigoPublishing.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_piwigo_session_real_is_authenticated;
+#line 11335 "PiwigoPublishing.c"
 }
 
 
@@ -11353,11 +11359,11 @@ static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * s
 	self->priv->pwg_id = NULL;
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 11342 "PiwigoPublishing.c"
+#line 11348 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj) {
 	PublishingPiwigoSession * self;
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
@@ -11369,7 +11375,7 @@ static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* ob
 	_g_free0 (self->priv->username);
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj);
-#line 11358 "PiwigoPublishing.c"
+#line 11364 "PiwigoPublishing.c"
 }
 
 
@@ -11391,9 +11397,9 @@ GType publishing_piwigo_session_get_type (void) {
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	PublishingPiwigoSession* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	PublishingPiwigoSession* _tmp0_;
+	PublishingPiwigoSession* _tmp1_;
+	gboolean _tmp2_;
 #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11406,12 +11412,12 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje
 	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_) {
-#line 11395 "PiwigoPublishing.c"
-		PublishingPiwigoSession* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 11401 "PiwigoPublishing.c"
+		PublishingPiwigoSession* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = session;
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11428,32 +11434,32 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje
 		_g_free0 (_tmp7_);
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 11417 "PiwigoPublishing.c"
+#line 11423 "PiwigoPublishing.c"
 	}
 #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11421 "PiwigoPublishing.c"
+#line 11427 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) {
 #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11428 "PiwigoPublishing.c"
+#line 11434 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	PublishingPiwigoSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingPiwigoSession* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	PublishingPiwigoSession* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingPiwigoSession* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11486,36 +11492,36 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticat
 	_g_free0 (_tmp6_);
 #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11475 "PiwigoPublishing.c"
+#line 11481 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) {
 #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11482 "PiwigoPublishing.c"
+#line 11488 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp0_;
+	xmlNode* _tmp1_;
 	gchar* status = NULL;
-	xmlNode* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	xmlNode* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp6_;
 	xmlNode* errcode = NULL;
-	xmlNode* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	xmlNode* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	xmlNode* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	xmlNode* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
@@ -11535,8 +11541,8 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	_tmp4_ = status;
 #line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 11524 "PiwigoPublishing.c"
-		gchar* _tmp5_ = NULL;
+#line 11530 "PiwigoPublishing.c"
+		gchar* _tmp5_;
 #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
 #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11545,7 +11551,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		_g_free0 (status);
 #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11534 "PiwigoPublishing.c"
+#line 11540 "PiwigoPublishing.c"
 	}
 #line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = status;
@@ -11557,13 +11563,13 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		_g_free0 (status);
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11546 "PiwigoPublishing.c"
+#line 11552 "PiwigoPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
-		xmlNode* _tmp9_ = NULL;
-		xmlNode* _tmp10_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp8_;
+		xmlNode* _tmp9_;
+		xmlNode* _tmp10_;
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = doc;
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11576,7 +11582,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11565 "PiwigoPublishing.c"
+#line 11571 "PiwigoPublishing.c"
 				goto __catch35_spit_publishing_publishing_error;
 			}
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11587,17 +11593,17 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 			g_clear_error (&_inner_error_);
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 11576 "PiwigoPublishing.c"
+#line 11582 "PiwigoPublishing.c"
 		}
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		errcode = _tmp7_;
-#line 11580 "PiwigoPublishing.c"
+#line 11586 "PiwigoPublishing.c"
 	}
 	goto __finally35;
 	__catch35_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp11_ = NULL;
+		gchar* _tmp11_;
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11612,7 +11618,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		_g_free0 (status);
 #line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11601 "PiwigoPublishing.c"
+#line 11607 "PiwigoPublishing.c"
 	}
 	__finally35:
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11625,7 +11631,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		g_clear_error (&_inner_error_);
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 11614 "PiwigoPublishing.c"
+#line 11620 "PiwigoPublishing.c"
 	}
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = errcode;
@@ -11653,18 +11659,18 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	_g_free0 (status);
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11642 "PiwigoPublishing.c"
+#line 11648 "PiwigoPublishing.c"
 }
 
 
 gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc) {
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp0_;
+	xmlNode* _tmp1_;
 	xmlNode* errcode = NULL;
-	xmlNode* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	xmlNode* _tmp7_;
+	gchar* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
@@ -11674,12 +11680,12 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
 #line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	root = _tmp1_;
-#line 11663 "PiwigoPublishing.c"
+#line 11669 "PiwigoPublishing.c"
 	{
 		xmlNode* _tmp2_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
-		xmlNode* _tmp4_ = NULL;
-		xmlNode* _tmp5_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp3_;
+		xmlNode* _tmp4_;
+		xmlNode* _tmp5_;
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = doc;
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11692,7 +11698,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11681 "PiwigoPublishing.c"
+#line 11687 "PiwigoPublishing.c"
 				goto __catch36_spit_publishing_publishing_error;
 			}
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11701,17 +11707,17 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 			g_clear_error (&_inner_error_);
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 11690 "PiwigoPublishing.c"
+#line 11696 "PiwigoPublishing.c"
 		}
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		errcode = _tmp2_;
-#line 11694 "PiwigoPublishing.c"
+#line 11700 "PiwigoPublishing.c"
 	}
 	goto __finally36;
 	__catch36_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp6_ = NULL;
+		gchar* _tmp6_;
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11724,7 +11730,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		_g_error_free0 (err);
 #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11713 "PiwigoPublishing.c"
+#line 11719 "PiwigoPublishing.c"
 	}
 	__finally36:
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11735,7 +11741,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		g_clear_error (&_inner_error_);
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 11724 "PiwigoPublishing.c"
+#line 11730 "PiwigoPublishing.c"
 	}
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = errcode;
@@ -11745,14 +11751,14 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 	result = _tmp8_;
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11734 "PiwigoPublishing.c"
+#line 11740 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) {
 #line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11741 "PiwigoPublishing.c"
+#line 11747 "PiwigoPublishing.c"
 }
 
 
@@ -11782,10 +11788,10 @@ GType publishing_piwigo_transaction_get_type (void) {
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
 	PublishingPiwigoSessionLoginTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11812,33 +11818,33 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11801 "PiwigoPublishing.c"
+#line 11807 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password);
-#line 11808 "PiwigoPublishing.c"
+#line 11814 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 11815 "PiwigoPublishing.c"
+#line 11821 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
 	PublishingPiwigoSessionLoginTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	PublishingPiwigoTransaction* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingPiwigoTransaction* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	PublishingRESTSupportArgument** _tmp6_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	PublishingPiwigoTransaction* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingPiwigoTransaction* _tmp4_;
+	gint _tmp5_;
+	PublishingRESTSupportArgument** _tmp6_;
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11859,7 +11865,7 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 	_tmp4_ = other;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_);
-#line 11848 "PiwigoPublishing.c"
+#line 11854 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportArgument** argument_collection = NULL;
 		gint argument_collection_length1 = 0;
@@ -11871,19 +11877,19 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 		argument_collection_length1 = _tmp5_;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) {
-#line 11860 "PiwigoPublishing.c"
-			PublishingRESTSupportArgument* _tmp7_ = NULL;
+#line 11866 "PiwigoPublishing.c"
+			PublishingRESTSupportArgument* _tmp7_;
 			PublishingRESTSupportArgument* argument = NULL;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			argument = _tmp7_;
-#line 11867 "PiwigoPublishing.c"
+#line 11873 "PiwigoPublishing.c"
 			{
-				PublishingRESTSupportArgument* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				PublishingRESTSupportArgument* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
+				PublishingRESTSupportArgument* _tmp8_;
+				const gchar* _tmp9_;
+				PublishingRESTSupportArgument* _tmp10_;
+				const gchar* _tmp11_;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp8_ = argument;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11896,30 +11902,30 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_);
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_argument_unref0 (argument);
-#line 11885 "PiwigoPublishing.c"
+#line 11891 "PiwigoPublishing.c"
 			}
 		}
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 11890 "PiwigoPublishing.c"
+#line 11896 "PiwigoPublishing.c"
 	}
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11894 "PiwigoPublishing.c"
+#line 11900 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other);
-#line 11901 "PiwigoPublishing.c"
+#line 11907 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) {
 #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11908 "PiwigoPublishing.c"
+#line 11914 "PiwigoPublishing.c"
 }
 
 
@@ -11944,13 +11950,13 @@ GType publishing_piwigo_session_login_transaction_get_type (void) {
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
 	PublishingPiwigoSessionGetStatusTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingPiwigoSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingPiwigoSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11983,20 +11989,20 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11972 "PiwigoPublishing.c"
+#line 11978 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id);
-#line 11979 "PiwigoPublishing.c"
+#line 11985 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoSessionGetStatusTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12007,21 +12013,21 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11996 "PiwigoPublishing.c"
+#line 12002 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) {
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session);
-#line 12003 "PiwigoPublishing.c"
+#line 12009 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) {
 #line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12010 "PiwigoPublishing.c"
+#line 12016 "PiwigoPublishing.c"
 }
 
 
@@ -12046,7 +12052,7 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) {
 
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoCategoriesGetListTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12059,21 +12065,21 @@ PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_l
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true");
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12048 "PiwigoPublishing.c"
+#line 12054 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) {
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session);
-#line 12055 "PiwigoPublishing.c"
+#line 12061 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) {
 #line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12062 "PiwigoPublishing.c"
+#line 12068 "PiwigoPublishing.c"
 }
 
 
@@ -12098,7 +12104,7 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
 
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoSessionLogoutTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12109,21 +12115,21 @@ PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_trans
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout");
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12098 "PiwigoPublishing.c"
+#line 12104 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) {
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session);
-#line 12105 "PiwigoPublishing.c"
+#line 12111 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) {
 #line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12112 "PiwigoPublishing.c"
+#line 12118 "PiwigoPublishing.c"
 }
 
 
@@ -12145,10 +12151,10 @@ GType publishing_piwigo_session_logout_transaction_get_type (void) {
 
 PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
 	PublishingPiwigoCategoriesAddTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp6_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp6_;
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12167,10 +12173,10 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans
 	_tmp2_ = parent_id;
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != 0) {
-#line 12156 "PiwigoPublishing.c"
-		gint _tmp3_ = 0;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+#line 12162 "PiwigoPublishing.c"
+		gint _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = parent_id;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12181,37 +12187,37 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 12170 "PiwigoPublishing.c"
+#line 12176 "PiwigoPublishing.c"
 	}
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = comment;
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "") != 0) {
-#line 12176 "PiwigoPublishing.c"
-		const gchar* _tmp7_ = NULL;
+#line 12182 "PiwigoPublishing.c"
+		const gchar* _tmp7_;
 #line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = comment;
 #line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_);
-#line 12182 "PiwigoPublishing.c"
+#line 12188 "PiwigoPublishing.c"
 	}
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12186 "PiwigoPublishing.c"
+#line 12192 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment);
-#line 12193 "PiwigoPublishing.c"
+#line 12199 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) {
 #line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12200 "PiwigoPublishing.c"
+#line 12206 "PiwigoPublishing.c"
 }
 
 
@@ -12233,410 +12239,410 @@ GType publishing_piwigo_categories_add_transaction_get_type (void) {
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
-#line 12233 "PiwigoPublishing.c"
+#line 12239 "PiwigoPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 12243 "PiwigoPublishing.c"
+#line 12249 "PiwigoPublishing.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 12253 "PiwigoPublishing.c"
+#line 12259 "PiwigoPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 12259 "PiwigoPublishing.c"
+#line 12265 "PiwigoPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 12270 "PiwigoPublishing.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12276 "PiwigoPublishing.c"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 12282 "PiwigoPublishing.c"
+#line 12288 "PiwigoPublishing.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 12286 "PiwigoPublishing.c"
+#line 12292 "PiwigoPublishing.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 12290 "PiwigoPublishing.c"
+#line 12296 "PiwigoPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 12294 "PiwigoPublishing.c"
+#line 12300 "PiwigoPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 12317 "PiwigoPublishing.c"
+#line 12323 "PiwigoPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 12326 "PiwigoPublishing.c"
+#line 12332 "PiwigoPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 12339 "PiwigoPublishing.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12345 "PiwigoPublishing.c"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 12345 "PiwigoPublishing.c"
+#line 12351 "PiwigoPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 12355 "PiwigoPublishing.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12361 "PiwigoPublishing.c"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 12367 "PiwigoPublishing.c"
+#line 12373 "PiwigoPublishing.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 12371 "PiwigoPublishing.c"
+#line 12377 "PiwigoPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 12377 "PiwigoPublishing.c"
+#line 12383 "PiwigoPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 12388 "PiwigoPublishing.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12394 "PiwigoPublishing.c"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 12403 "PiwigoPublishing.c"
+#line 12409 "PiwigoPublishing.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 12407 "PiwigoPublishing.c"
+#line 12413 "PiwigoPublishing.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 12411 "PiwigoPublishing.c"
+#line 12417 "PiwigoPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 12417 "PiwigoPublishing.c"
+#line 12423 "PiwigoPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 12429 "PiwigoPublishing.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12435 "PiwigoPublishing.c"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 12450 "PiwigoPublishing.c"
+#line 12456 "PiwigoPublishing.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 12454 "PiwigoPublishing.c"
+#line 12460 "PiwigoPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 12460 "PiwigoPublishing.c"
+#line 12466 "PiwigoPublishing.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 12467 "PiwigoPublishing.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12473 "PiwigoPublishing.c"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
-#line 12475 "PiwigoPublishing.c"
+#line 12481 "PiwigoPublishing.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 12513 "PiwigoPublishing.c"
+#line 12519 "PiwigoPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 12522 "PiwigoPublishing.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+#line 12528 "PiwigoPublishing.c"
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 12538 "PiwigoPublishing.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12544 "PiwigoPublishing.c"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 12544 "PiwigoPublishing.c"
+#line 12550 "PiwigoPublishing.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 12558 "PiwigoPublishing.c"
+#line 12564 "PiwigoPublishing.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 12578 "PiwigoPublishing.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 12584 "PiwigoPublishing.c"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 12593 "PiwigoPublishing.c"
+#line 12599 "PiwigoPublishing.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 12597 "PiwigoPublishing.c"
+#line 12603 "PiwigoPublishing.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 12605 "PiwigoPublishing.c"
+#line 12611 "PiwigoPublishing.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 12616 "PiwigoPublishing.c"
+#line 12622 "PiwigoPublishing.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 12625 "PiwigoPublishing.c"
+#line 12631 "PiwigoPublishing.c"
 	}
 }
 
@@ -12644,83 +12650,83 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 static void _g_free0_ (gpointer var) {
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	var = (g_free (var), NULL);
-#line 12633 "PiwigoPublishing.c"
+#line 12639 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingPiwigoImagesAddTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_ = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	PublishingPiwigoSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	PublishingPiwigoSession* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingPiwigoPublishingParameters* _tmp12_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp13_ = NULL;
+	PublishingPiwigoSession* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	PublishingPiwigoSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	PublishingPiwigoSession* _tmp5_;
+	gboolean _tmp6_;
+	PublishingPiwigoPublishingParameters* _tmp12_;
+	PublishingPiwigoPublishingParameters* _tmp13_;
 	gchar** keywords = NULL;
-	SpitPublishingPublishable* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gchar** _tmp16_ = NULL;
-	gint keywords_length1 = 0;
-	gint _keywords_size_ = 0;
+	SpitPublishingPublishable* _tmp14_;
+	gint _tmp15_;
+	gchar** _tmp16_;
+	gint keywords_length1;
+	gint _keywords_size_;
 	gchar* tags = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	SpitPublishingPublishable* _tmp21_ = NULL;
-	GFile* _tmp22_ = NULL;
-	GFile* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp26_ = NULL;
-	PublishingPiwigoCategory* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	PublishingPiwigoPublishingParameters* _tmp29_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
+	gchar* _tmp17_;
+	gchar** _tmp18_;
+	gint _tmp18__length1;
+	SpitPublishingPublishable* _tmp21_;
+	GFile* _tmp22_;
+	GFile* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	PublishingPiwigoPublishingParameters* _tmp26_;
+	PublishingPiwigoCategory* _tmp27_;
+	gint _tmp28_;
+	PublishingPiwigoPublishingParameters* _tmp29_;
+	PublishingPiwigoPermissionLevel* _tmp30_;
+	gint _tmp31_;
 	gchar* name = NULL;
-	SpitPublishingPublishable* _tmp32_ = NULL;
-	gchar* _tmp33_ = NULL;
+	SpitPublishingPublishable* _tmp32_;
+	gchar* _tmp33_;
 	gchar* comment = NULL;
-	SpitPublishingPublishable* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
+	SpitPublishingPublishable* _tmp34_;
+	gchar* _tmp35_;
 	gboolean _tmp36_ = FALSE;
-	const gchar* _tmp37_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp55_ = NULL;
-	PublishingPiwigoCategory* _tmp56_ = NULL;
-	gint _tmp57_ = 0;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp60_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp61_ = NULL;
-	gint _tmp62_ = 0;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp65_ = NULL;
-	gboolean _tmp66_ = FALSE;
+	const gchar* _tmp37_;
+	PublishingPiwigoPublishingParameters* _tmp55_;
+	PublishingPiwigoCategory* _tmp56_;
+	gint _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	PublishingPiwigoPublishingParameters* _tmp60_;
+	PublishingPiwigoPermissionLevel* _tmp61_;
+	gint _tmp62_;
+	gchar* _tmp63_;
+	gchar* _tmp64_;
+	PublishingPiwigoPublishingParameters* _tmp65_;
+	gboolean _tmp66_;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp69_ = NULL;
-	GEqualFunc _tmp70_ = NULL;
-	GHashTable* _tmp71_ = NULL;
+	GHashFunc _tmp69_;
+	GEqualFunc _tmp70_;
+	GHashTable* _tmp71_;
 	gchar* basename = NULL;
-	SpitPublishingPublishable* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
+	SpitPublishingPublishable* _tmp72_;
+	gchar* _tmp73_;
 	gboolean _tmp74_ = FALSE;
-	const gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	gchar* _tmp77_ = NULL;
-	gboolean _tmp78_ = FALSE;
-	gboolean _tmp79_ = FALSE;
-	GHashTable* _tmp86_ = NULL;
-	gchar* _tmp87_ = NULL;
-	const gchar* _tmp88_ = NULL;
-	gchar* _tmp89_ = NULL;
-	GHashTable* _tmp90_ = NULL;
-	gchar* _tmp91_ = NULL;
-	gchar* _tmp92_ = NULL;
-	GHashTable* _tmp93_ = NULL;
+	const gchar* _tmp75_;
+	gchar* _tmp76_;
+	gchar* _tmp77_;
+	gboolean _tmp78_;
+	gboolean _tmp79_;
+	GHashTable* _tmp86_;
+	gchar* _tmp87_;
+	const gchar* _tmp88_;
+	gchar* _tmp89_;
+	GHashTable* _tmp90_;
+	gchar* _tmp91_;
+	gchar* _tmp92_;
+	GHashTable* _tmp93_;
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12747,12 +12753,12 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 12736 "PiwigoPublishing.c"
-		PublishingPiwigoSession* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
+#line 12742 "PiwigoPublishing.c"
+		PublishingPiwigoSession* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = session;
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12769,7 +12775,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (_tmp11_);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp9_);
-#line 12758 "PiwigoPublishing.c"
+#line 12764 "PiwigoPublishing.c"
 	}
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = parameters;
@@ -12799,10 +12805,10 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp18__length1 = keywords_length1;
 #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp18_ != NULL) {
-#line 12788 "PiwigoPublishing.c"
-		gchar** _tmp19_ = NULL;
-		gint _tmp19__length1 = 0;
-		gchar* _tmp20_ = NULL;
+#line 12794 "PiwigoPublishing.c"
+		gchar** _tmp19_;
+		gint _tmp19__length1;
+		gchar* _tmp20_;
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = keywords;
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12813,7 +12819,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (tags);
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		tags = _tmp20_;
-#line 12802 "PiwigoPublishing.c"
+#line 12808 "PiwigoPublishing.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishable;
@@ -12862,23 +12868,23 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	if (_tmp37_ == NULL) {
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = TRUE;
-#line 12850 "PiwigoPublishing.c"
+#line 12856 "PiwigoPublishing.c"
 	} else {
-		const gchar* _tmp38_ = NULL;
+		const gchar* _tmp38_;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp38_ = name;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 12857 "PiwigoPublishing.c"
+#line 12863 "PiwigoPublishing.c"
 	}
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp36_) {
-#line 12861 "PiwigoPublishing.c"
-		SpitPublishingPublishable* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
+#line 12867 "PiwigoPublishing.c"
+		SpitPublishingPublishable* _tmp39_;
+		gchar* _tmp40_;
+		const gchar* _tmp41_;
 		gboolean _tmp42_ = FALSE;
-		const gchar* _tmp43_ = NULL;
+		const gchar* _tmp43_;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp39_ = publishable;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12895,52 +12901,52 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_tmp43_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp43_ != NULL) {
-#line 12883 "PiwigoPublishing.c"
-			const gchar* _tmp44_ = NULL;
+#line 12889 "PiwigoPublishing.c"
+			const gchar* _tmp44_;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = g_strcmp0 (_tmp44_, "") != 0;
-#line 12889 "PiwigoPublishing.c"
+#line 12895 "PiwigoPublishing.c"
 		} else {
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = FALSE;
-#line 12893 "PiwigoPublishing.c"
+#line 12899 "PiwigoPublishing.c"
 		}
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp42_) {
-#line 12897 "PiwigoPublishing.c"
-			const gchar* _tmp45_ = NULL;
+#line 12903 "PiwigoPublishing.c"
+			const gchar* _tmp45_;
 #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp45_ = comment;
 #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp45_);
-#line 12903 "PiwigoPublishing.c"
+#line 12909 "PiwigoPublishing.c"
 		}
 	} else {
 		gboolean _tmp46_ = FALSE;
-		const gchar* _tmp47_ = NULL;
+		const gchar* _tmp47_;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp47_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp47_ != NULL) {
-#line 12912 "PiwigoPublishing.c"
-			const gchar* _tmp48_ = NULL;
+#line 12918 "PiwigoPublishing.c"
+			const gchar* _tmp48_;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp48_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = g_strcmp0 (_tmp48_, "") != 0;
-#line 12918 "PiwigoPublishing.c"
+#line 12924 "PiwigoPublishing.c"
 		} else {
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = FALSE;
-#line 12922 "PiwigoPublishing.c"
+#line 12928 "PiwigoPublishing.c"
 		}
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp46_) {
-#line 12926 "PiwigoPublishing.c"
-			const gchar* _tmp49_ = NULL;
-			const gchar* _tmp50_ = NULL;
+#line 12932 "PiwigoPublishing.c"
+			const gchar* _tmp49_;
+			const gchar* _tmp50_;
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp49_ = name;
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12949,30 +12955,30 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 			_tmp50_ = comment;
 #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp50_);
-#line 12937 "PiwigoPublishing.c"
+#line 12943 "PiwigoPublishing.c"
 		} else {
-			PublishingPiwigoPublishingParameters* _tmp51_ = NULL;
-			gboolean _tmp52_ = FALSE;
+			PublishingPiwigoPublishingParameters* _tmp51_;
+			gboolean _tmp52_;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp51_ = parameters;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp52_ = _tmp51_->title_as_comment;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_tmp52_) {
-#line 12947 "PiwigoPublishing.c"
-				const gchar* _tmp53_ = NULL;
+#line 12953 "PiwigoPublishing.c"
+				const gchar* _tmp53_;
 #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp53_ = name;
 #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp53_);
-#line 12953 "PiwigoPublishing.c"
+#line 12959 "PiwigoPublishing.c"
 			} else {
-				const gchar* _tmp54_ = NULL;
+				const gchar* _tmp54_;
 #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp54_ = name;
 #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp54_);
-#line 12960 "PiwigoPublishing.c"
+#line 12966 "PiwigoPublishing.c"
 			}
 		}
 	}
@@ -13012,19 +13018,19 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp66_ = _tmp65_->no_upload_tags;
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp66_) {
-#line 13000 "PiwigoPublishing.c"
-		const gchar* _tmp67_ = NULL;
+#line 13006 "PiwigoPublishing.c"
+		const gchar* _tmp67_;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp67_ = tags;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_strcmp0 (_tmp67_, "") != 0) {
-#line 13006 "PiwigoPublishing.c"
-			const gchar* _tmp68_ = NULL;
+#line 13012 "PiwigoPublishing.c"
+			const gchar* _tmp68_;
 #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp68_ = tags;
 #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp68_);
-#line 13012 "PiwigoPublishing.c"
+#line 13018 "PiwigoPublishing.c"
 		}
 	}
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13055,11 +13061,11 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_g_free0 (_tmp77_);
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp79_) {
-#line 13043 "PiwigoPublishing.c"
-		const gchar* _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		gchar* _tmp82_ = NULL;
-		gboolean _tmp83_ = FALSE;
+#line 13049 "PiwigoPublishing.c"
+		const gchar* _tmp80_;
+		gchar* _tmp81_;
+		gchar* _tmp82_;
+		gboolean _tmp83_;
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp80_ = basename;
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13072,17 +13078,17 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_tmp74_ = !_tmp83_;
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp82_);
-#line 13060 "PiwigoPublishing.c"
+#line 13066 "PiwigoPublishing.c"
 	} else {
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp74_ = FALSE;
-#line 13064 "PiwigoPublishing.c"
+#line 13070 "PiwigoPublishing.c"
 	}
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp74_) {
-#line 13068 "PiwigoPublishing.c"
-		const gchar* _tmp84_ = NULL;
-		gchar* _tmp85_ = NULL;
+#line 13074 "PiwigoPublishing.c"
+		const gchar* _tmp84_;
+		gchar* _tmp85_;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp84_ = basename;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13091,7 +13097,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (basename);
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		basename = _tmp85_;
-#line 13079 "PiwigoPublishing.c"
+#line 13085 "PiwigoPublishing.c"
 	}
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp86_ = disposition_table;
@@ -13129,14 +13135,14 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 13117 "PiwigoPublishing.c"
+#line 13123 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable);
-#line 13124 "PiwigoPublishing.c"
+#line 13130 "PiwigoPublishing.c"
 }
 
 
@@ -13147,7 +13153,7 @@ static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwig
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize;
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate));
-#line 13135 "PiwigoPublishing.c"
+#line 13141 "PiwigoPublishing.c"
 }
 
 
@@ -13156,11 +13162,11 @@ static void publishing_piwigo_images_add_transaction_instance_init (PublishingPi
 	self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self);
 #line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = NULL;
-#line 13144 "PiwigoPublishing.c"
+#line 13150 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingPiwigoImagesAddTransaction * self;
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction);
@@ -13168,7 +13174,7 @@ static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSup
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj);
-#line 13156 "PiwigoPublishing.c"
+#line 13162 "PiwigoPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index 188562b..4be28b4 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -1,4 +1,4 @@
-/* YouTubePublishing.c generated by valac 0.34.7, the Vala compiler
+/* YouTubePublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from YouTubePublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -112,6 +112,12 @@ typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass Pu
 typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate;
 #define _publishing_you_tube_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_options_pane_privacy_description_unref (var), NULL)))
 typedef struct _PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescription PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescription;
+enum  {
+	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION (publishing_you_tube_upload_transaction_get_type ())
 #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction))
@@ -267,7 +273,9 @@ struct _PublishingYouTubeUploadTransactionSpliceWithProgressData {
 	int _state_;
 	GObject* _source_object_;
 	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
+	GTask* _async_result;
+	GAsyncReadyCallback _callback_;
+	gboolean _task_complete_;
 	PublishingYouTubeUploadTransaction* self;
 	GFileInfo* info;
 	GInputStream* input;
@@ -318,15 +326,15 @@ static gint you_tube_service_icon_pixbuf_set_length1;
 static GdkPixbuf** you_tube_service_icon_pixbuf_set = NULL;
 static gint you_tube_service_icon_pixbuf_set_length1 = 0;
 static gint _you_tube_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* you_tube_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* you_tube_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * you_tube_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * you_tube_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_you_tube_publishing_parameters_parent_class = NULL;
 static gpointer publishing_you_tube_you_tube_authorizer_parent_class = NULL;
-static GDataAuthorizerInterface* publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = NULL;
+static GDataAuthorizerInterface * publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = NULL;
 static gpointer publishing_you_tube_you_tube_publisher_parent_class = NULL;
 static gpointer publishing_you_tube_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_you_tube_upload_transaction_parent_class = NULL;
 static gpointer publishing_you_tube_uploader_parent_class = NULL;
 
@@ -348,7 +356,7 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
 GType publishing_you_tube_you_tube_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_media (SpitPublishingService* base);
 static void you_tube_service_real_activation (SpitPluggable* base, gboolean enabled);
-static void you_tube_service_finalize (GObject* obj);
+static void you_tube_service_finalize (GObject * obj);
 #define PUBLISHING_YOU_TUBE_DEVELOPER_KEY "AIzaSyB6hLnm0n5j8Y6Bkvh9bz3i8ADM2bJdYeY"
 GType publishing_you_tube_privacy_setting_get_type (void) G_GNUC_CONST;
 gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance);
@@ -368,7 +376,7 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr
 void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy);
 gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self);
 void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name);
-static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj);
+static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj);
 GType publishing_you_tube_you_tube_authorizer_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerPrivate))
 enum  {
@@ -379,7 +387,7 @@ PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_cons
 static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain);
 static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message);
 static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error);
-static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj);
+static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj);
 #define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisherPrivate))
 enum  {
 	PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_DUMMY_PROPERTY
@@ -409,7 +417,7 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_
 static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
 static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base);
 static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
-static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj);
+static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj);
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance);
 static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance);
 static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -429,9 +437,9 @@ static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_
 static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
 static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
@@ -439,8 +447,8 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled
 enum  {
 	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY
 };
-static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription* obj);
-static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj);
+static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj);
+static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj);
 GType publishing_you_tube_upload_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransactionPrivate))
 enum  {
@@ -457,23 +465,24 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_finish (
 static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res);
 static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
 static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data);
+static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
 static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_);
 static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
-static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
+static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
 #define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate))
 enum  {
 	PUBLISHING_YOU_TUBE_UPLOADER_DUMMY_PROPERTY
 };
 static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory) {
 	YouTubeService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -484,9 +493,9 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 	_tmp0__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 488 "YouTubePublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 497 "YouTubePublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" YOU_TUBE_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -497,27 +506,27 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 		you_tube_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1;
-#line 501 "YouTubePublishing.c"
+#line 510 "YouTubePublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 505 "YouTubePublishing.c"
+#line 514 "YouTubePublishing.c"
 }
 
 
 YouTubeService* you_tube_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory);
-#line 512 "YouTubePublishing.c"
+#line 521 "YouTubePublishing.c"
 }
 
 
 static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	YouTubeService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -530,7 +539,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 534 "YouTubePublishing.c"
+#line 543 "YouTubePublishing.c"
 }
 
 
@@ -543,7 +552,7 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.youtube";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 547 "YouTubePublishing.c"
+#line 556 "YouTubePublishing.c"
 }
 
 
@@ -556,14 +565,14 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "YouTube";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 560 "YouTubePublishing.c"
+#line 569 "YouTubePublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 567 "YouTubePublishing.c"
+#line 576 "YouTubePublishing.c"
 }
 
 
@@ -574,34 +583,33 @@ static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 578 "YouTubePublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 587 "YouTubePublishing.c"
+		GdkPixbuf* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		result[i] = _tmp0_;
-#line 584 "YouTubePublishing.c"
+#line 593 "YouTubePublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 588 "YouTubePublishing.c"
+#line 597 "YouTubePublishing.c"
 }
 
 
 static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	YouTubeService * 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 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -613,68 +621,66 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*info).authors = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc.");
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 ((*info).translators);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 ((*info).version);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 ((*info).license);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = you_tube_service_icon_pixbuf_set;
+	_tmp7_ = you_tube_service_icon_pixbuf_set;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8__length1 = you_tube_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup9 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup9 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 670 "YouTubePublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 676 "YouTubePublishing.c"
 }
 
 
 static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	YouTubeService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingYouTubeYouTubePublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingYouTubeYouTubePublisher* _tmp1_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -687,7 +693,7 @@ static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 691 "YouTubePublishing.c"
+#line 697 "YouTubePublishing.c"
 }
 
 
@@ -700,7 +706,7 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 704 "YouTubePublishing.c"
+#line 710 "YouTubePublishing.c"
 }
 
 
@@ -708,7 +714,7 @@ static void you_tube_service_real_activation (SpitPluggable* base, gboolean enab
 	YouTubeService * self;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
-#line 712 "YouTubePublishing.c"
+#line 718 "YouTubePublishing.c"
 }
 
 
@@ -717,7 +723,7 @@ static void you_tube_service_class_init (YouTubeServiceClass * klass) {
 	you_tube_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize;
-#line 721 "YouTubePublishing.c"
+#line 727 "YouTubePublishing.c"
 }
 
 
@@ -725,16 +731,16 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface *
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	you_tube_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) you_tube_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) you_tube_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) you_tube_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) you_tube_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) you_tube_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) you_tube_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) you_tube_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) you_tube_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) you_tube_service_real_activation;
-#line 738 "YouTubePublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) you_tube_service_real_activation;
+#line 744 "YouTubePublishing.c"
 }
 
 
@@ -742,10 +748,10 @@ static void you_tube_service_spit_publishing_service_interface_init (SpitPublish
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	you_tube_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher;
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) you_tube_service_real_get_supported_media;
-#line 749 "YouTubePublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) you_tube_service_real_get_supported_media;
+#line 755 "YouTubePublishing.c"
 }
 
 
@@ -753,13 +759,13 @@ static void you_tube_service_instance_init (YouTubeService * self) {
 }
 
 
-static void you_tube_service_finalize (GObject* obj) {
+static void you_tube_service_finalize (GObject * obj) {
 	YouTubeService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj);
-#line 763 "YouTubePublishing.c"
+#line 769 "YouTubePublishing.c"
 }
 
 
@@ -803,20 +809,20 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters
 	self->priv->user_name = NULL;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 807 "YouTubePublishing.c"
+#line 813 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS);
-#line 814 "YouTubePublishing.c"
+#line 820 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self) {
 	PublishingYouTubePrivacySetting result = 0;
-	PublishingYouTubePrivacySetting _tmp0_ = 0;
+	PublishingYouTubePrivacySetting _tmp0_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), 0);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -825,26 +831,26 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 829 "YouTubePublishing.c"
+#line 835 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy) {
-	PublishingYouTubePrivacySetting _tmp0_ = 0;
+	PublishingYouTubePrivacySetting _tmp0_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = privacy;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy = _tmp0_;
-#line 841 "YouTubePublishing.c"
+#line 847 "YouTubePublishing.c"
 }
 
 
 gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), NULL);
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -855,13 +861,13 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub
 	result = _tmp1_;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 859 "YouTubePublishing.c"
+#line 865 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -872,14 +878,14 @@ void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubeP
 	_g_free0 (self->priv->user_name);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 876 "YouTubePublishing.c"
+#line 882 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_init (GValue* value) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 883 "YouTubePublishing.c"
+#line 889 "YouTubePublishing.c"
 }
 
 
@@ -888,7 +894,7 @@ static void publishing_you_tube_value_publishing_parameters_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer);
-#line 892 "YouTubePublishing.c"
+#line 898 "YouTubePublishing.c"
 	}
 }
 
@@ -898,11 +904,11 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV
 	if (src_value->data[0].v_pointer) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 902 "YouTubePublishing.c"
+#line 908 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 906 "YouTubePublishing.c"
+#line 912 "YouTubePublishing.c"
 	}
 }
 
@@ -910,66 +916,66 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV
 static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 914 "YouTubePublishing.c"
+#line 920 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 921 "YouTubePublishing.c"
-		PublishingYouTubePublishingParameters* object;
+#line 927 "YouTubePublishing.c"
+		PublishingYouTubePublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 928 "YouTubePublishing.c"
+#line 934 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 932 "YouTubePublishing.c"
+#line 938 "YouTubePublishing.c"
 		}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object);
-#line 936 "YouTubePublishing.c"
+#line 942 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 940 "YouTubePublishing.c"
+#line 946 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 944 "YouTubePublishing.c"
+#line 950 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingYouTubePublishingParameters** object_p;
+	PublishingYouTubePublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 955 "YouTubePublishing.c"
+#line 961 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 961 "YouTubePublishing.c"
+#line 967 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 965 "YouTubePublishing.c"
+#line 971 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 969 "YouTubePublishing.c"
+#line 975 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 973 "YouTubePublishing.c"
+#line 979 "YouTubePublishing.c"
 }
 
 
@@ -983,7 +989,7 @@ GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 987 "YouTubePublishing.c"
+#line 993 "YouTubePublishing.c"
 }
 
 
@@ -992,12 +998,12 @@ gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* valu
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 996 "YouTubePublishing.c"
+#line 1002 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingYouTubePublishingParameters* old;
+	PublishingYouTubePublishingParameters * old;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1012,23 +1018,23 @@ void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointe
 		value->data[0].v_pointer = v_object;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1016 "YouTubePublishing.c"
+#line 1022 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1020 "YouTubePublishing.c"
+#line 1026 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1026 "YouTubePublishing.c"
+#line 1032 "YouTubePublishing.c"
 	}
 }
 
 
 void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object) {
-	PublishingYouTubePublishingParameters* old;
+	PublishingYouTubePublishingParameters * old;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1041,17 +1047,17 @@ void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpoint
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1045 "YouTubePublishing.c"
+#line 1051 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1049 "YouTubePublishing.c"
+#line 1055 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1055 "YouTubePublishing.c"
+#line 1061 "YouTubePublishing.c"
 	}
 }
 
@@ -1063,7 +1069,7 @@ static void publishing_you_tube_publishing_parameters_class_init (PublishingYouT
 	((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate));
-#line 1067 "YouTubePublishing.c"
+#line 1073 "YouTubePublishing.c"
 }
 
 
@@ -1072,11 +1078,11 @@ static void publishing_you_tube_publishing_parameters_instance_init (PublishingY
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 1076 "YouTubePublishing.c"
+#line 1082 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj) {
+static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj) {
 	PublishingYouTubePublishingParameters * self;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS, PublishingYouTubePublishingParameters);
@@ -1084,7 +1090,7 @@ static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTub
 	g_signal_handlers_destroy (self);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 1088 "YouTubePublishing.c"
+#line 1094 "YouTubePublishing.c"
 }
 
 
@@ -1103,18 +1109,18 @@ GType publishing_you_tube_publishing_parameters_get_type (void) {
 
 
 gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
-	PublishingYouTubePublishingParameters* self;
+	PublishingYouTubePublishingParameters * self;
 	self = instance;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 1113 "YouTubePublishing.c"
+#line 1119 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
-	PublishingYouTubePublishingParameters* self;
+	PublishingYouTubePublishingParameters * self;
 	self = instance;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1122,7 +1128,7 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1126 "YouTubePublishing.c"
+#line 1132 "YouTubePublishing.c"
 	}
 }
 
@@ -1130,16 +1136,16 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 1134 "YouTubePublishing.c"
+#line 1140 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
 	PublishingYouTubeYouTubeAuthorizer * self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	SpitPublishingAuthenticator* _tmp2_ = NULL;
-	SpitPublishingAuthenticator* _tmp3_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
+	SpitPublishingAuthenticator* _tmp2_;
+	SpitPublishingAuthenticator* _tmp3_;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1164,14 +1170,14 @@ PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_cons
 	self->priv->authenticator = _tmp3_;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 1168 "YouTubePublishing.c"
+#line 1174 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_you_tube_authorizer_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, session, authenticator);
-#line 1175 "YouTubePublishing.c"
+#line 1181 "YouTubePublishing.c"
 }
 
 
@@ -1186,22 +1192,22 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_d
 	result = TRUE;
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1190 "YouTubePublishing.c"
+#line 1196 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message) {
 	PublishingYouTubeYouTubeAuthorizer * self;
-	GDataAuthorizationDomain* _tmp0_ = NULL;
+	GDataAuthorizationDomain* _tmp0_;
 	gchar* header = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	SoupMessage* _tmp6_ = NULL;
-	SoupMessageHeaders* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	SoupMessage* _tmp6_;
+	SoupMessageHeaders* _tmp7_;
+	const gchar* _tmp8_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1214,7 +1220,7 @@ static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataA
 	if (_tmp0_ == NULL) {
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1218 "YouTubePublishing.c"
+#line 1224 "YouTubePublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->session;
@@ -1240,14 +1246,14 @@ static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataA
 	soup_message_headers_replace (_tmp7_, "Authorization", _tmp8_);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (header);
-#line 1244 "YouTubePublishing.c"
+#line 1250 "YouTubePublishing.c"
 }
 
 
 static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error) {
 	PublishingYouTubeYouTubeAuthorizer * self;
 	gboolean result = FALSE;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1260,7 +1266,7 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorizati
 	result = TRUE;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1264 "YouTubePublishing.c"
+#line 1270 "YouTubePublishing.c"
 }
 
 
@@ -1271,7 +1277,7 @@ static void publishing_you_tube_you_tube_authorizer_class_init (PublishingYouTub
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubeAuthorizerPrivate));
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_authorizer_finalize;
-#line 1275 "YouTubePublishing.c"
+#line 1281 "YouTubePublishing.c"
 }
 
 
@@ -1279,23 +1285,23 @@ static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_i
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = g_type_interface_peek_parent (iface);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->is_authorized_for_domain = (gboolean (*)(GDataAuthorizer*, GDataAuthorizationDomain*)) publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain;
+	iface->is_authorized_for_domain = (gboolean (*) (GDataAuthorizer *, GDataAuthorizationDomain*)) publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->process_request = (void (*)(GDataAuthorizer*, GDataAuthorizationDomain*, SoupMessage*)) publishing_you_tube_you_tube_authorizer_real_process_request;
+	iface->process_request = (void (*) (GDataAuthorizer *, GDataAuthorizationDomain*, SoupMessage*)) publishing_you_tube_you_tube_authorizer_real_process_request;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->refresh_authorization = (gboolean (*)(GDataAuthorizer*, GCancellable*, GError**)) publishing_you_tube_you_tube_authorizer_real_refresh_authorization;
-#line 1288 "YouTubePublishing.c"
+	iface->refresh_authorization = (gboolean (*) (GDataAuthorizer *, GCancellable*, GError**)) publishing_you_tube_you_tube_authorizer_real_refresh_authorization;
+#line 1294 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_authorizer_instance_init (PublishingYouTubeYouTubeAuthorizer * self) {
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE (self);
-#line 1295 "YouTubePublishing.c"
+#line 1301 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj) {
+static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj) {
 	PublishingYouTubeYouTubeAuthorizer * self;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
@@ -1305,7 +1311,7 @@ static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->authenticator);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_you_tube_authorizer_parent_class)->finalize (obj);
-#line 1309 "YouTubePublishing.c"
+#line 1315 "YouTubePublishing.c"
 }
 
 
@@ -1325,9 +1331,9 @@ GType publishing_you_tube_you_tube_authorizer_get_type (void) {
 
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingYouTubeYouTubePublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingYouTubePublishingParameters* _tmp2_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1362,21 +1368,21 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 1366 "YouTubePublishing.c"
+#line 1372 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host);
-#line 1373 "YouTubePublishing.c"
+#line 1379 "YouTubePublishing.c"
 }
 
 
 static gboolean publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1385,14 +1391,14 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi
 	result = _tmp0_;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1389 "YouTubePublishing.c"
+#line 1395 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	gboolean _tmp0_ = FALSE;
-	SpitPublishingAuthenticator* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	SpitPublishingAuthenticator* _tmp1_;
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1403,7 +1409,7 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
 	if (_tmp0_) {
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1407 "YouTubePublishing.c"
+#line 1413 "YouTubePublishing.c"
 	}
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = TRUE;
@@ -1411,14 +1417,14 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
 	_tmp1_ = self->priv->authenticator;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_authenticator_authenticate (_tmp1_);
-#line 1415 "YouTubePublishing.c"
+#line 1421 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1433,23 +1439,23 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp
 	publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1437 "YouTubePublishing.c"
+#line 1443 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	PublishingYouTubePublishingParameters* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp5_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp6_ = NULL;
-	SpitPublishingAuthenticator* _tmp7_ = NULL;
-	PublishingYouTubeYouTubeAuthorizer* _tmp8_ = NULL;
-	PublishingYouTubeYouTubeAuthorizer* _tmp9_ = NULL;
-	GDataYouTubeService* _tmp10_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
+	PublishingRESTSupportGoogleSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	PublishingRESTSupportGoogleSession* _tmp5_;
+	PublishingRESTSupportGoogleSession* _tmp6_;
+	SpitPublishingAuthenticator* _tmp7_;
+	PublishingYouTubeYouTubeAuthorizer* _tmp8_;
+	PublishingYouTubeYouTubeAuthorizer* _tmp9_;
+	GDataYouTubeService* _tmp10_;
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1492,12 +1498,12 @@ static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (
 	_publishing_rest_support_session_unref0 (_tmp6_);
 #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
-#line 1496 "YouTubePublishing.c"
+#line 1502 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1509,16 +1515,16 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout
 	if (!_tmp0_) {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1512 "YouTubePublishing.c"
+#line 1518 "YouTubePublishing.c"
 	}
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1516 "YouTubePublishing.c"
+#line 1522 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1530,23 +1536,23 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish
 	if (!_tmp0_) {
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1532 "YouTubePublishing.c"
+#line 1538 "YouTubePublishing.c"
 	}
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1536 "YouTubePublishing.c"
+#line 1542 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self, gint file_number, gdouble completed_fraction) {
-	gdouble _tmp0_ = 0.0;
-	SpitPublishingProgressCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	gboolean _tmp2_ = FALSE;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gdouble _tmp0_;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
+	gboolean _tmp2_;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1566,7 +1572,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
 	if (!_tmp2_) {
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1567 "YouTubePublishing.c"
+#line 1573 "YouTubePublishing.c"
 	}
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
@@ -1578,31 +1584,31 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
 	_tmp5_ = completed_fraction;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1579 "YouTubePublishing.c"
+#line 1585 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published);
-#line 1586 "YouTubePublishing.c"
+#line 1592 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1593 "YouTubePublishing.c"
+#line 1599 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1630,24 +1636,24 @@ static void publishing_you_tube_you_tube_publisher_on_upload_complete (Publishin
 	if (!_tmp5_) {
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1630 "YouTubePublishing.c"
+#line 1636 "YouTubePublishing.c"
 	}
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_success_pane (self);
-#line 1634 "YouTubePublishing.c"
+#line 1640 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	GError* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	GError* _tmp5_;
+	const gchar* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GError* _tmp8_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1670,7 +1676,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
 	if (!_tmp4_) {
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1670 "YouTubePublishing.c"
+#line 1676 "YouTubePublishing.c"
 	}
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = err;
@@ -1685,38 +1691,38 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
 	_tmp8_ = err;
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1684 "YouTubePublishing.c"
+#line 1690 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self);
-#line 1691 "YouTubePublishing.c"
+#line 1697 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self);
-#line 1698 "YouTubePublishing.c"
+#line 1704 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self) {
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 	PublishingYouTubePublishingOptionsPane* opts_pane = NULL;
-	SpitPublishingAuthenticator* _tmp8_ = NULL;
-	SpitPublishingPluginHost* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp11_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp12_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp13_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp14_ = NULL;
-	SpitPublishingPluginHost* _tmp15_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp16_ = NULL;
-	SpitPublishingPluginHost* _tmp17_ = NULL;
+	SpitPublishingAuthenticator* _tmp7_;
+	SpitPublishingPluginHost* _tmp8_;
+	GtkBuilder* _tmp9_;
+	PublishingYouTubePublishingParameters* _tmp10_;
+	PublishingYouTubePublishingOptionsPane* _tmp11_;
+	PublishingYouTubePublishingOptionsPane* _tmp12_;
+	PublishingYouTubePublishingOptionsPane* _tmp13_;
+	SpitPublishingPluginHost* _tmp14_;
+	PublishingYouTubePublishingOptionsPane* _tmp15_;
+	SpitPublishingPluginHost* _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
@@ -1726,16 +1732,16 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	_tmp0_ = gtk_builder_new ();
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	builder = _tmp0_;
-#line 1725 "YouTubePublishing.c"
+#line 1731 "YouTubePublishing.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
+		GtkBuilder* _tmp1_;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp1_ = builder;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_);
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1734 "YouTubePublishing.c"
+#line 1740 "YouTubePublishing.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -1743,12 +1749,11 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	__catch20_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
+		GError* _tmp6_;
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		e = _inner_error_;
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1762,23 +1767,21 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to YouTube c" \
-"an’t continue.");
+		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to YouTube c" \
+"an’t continue."));
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
+		_tmp6_ = _tmp5_;
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp7_ = _tmp6_;
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_);
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (_tmp7_);
+		_g_error_free0 (_tmp6_);
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (e);
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_object_unref0 (builder);
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1776 "YouTubePublishing.c"
+#line 1779 "YouTubePublishing.c"
 	}
 	__finally20:
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1791,79 +1794,79 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		g_clear_error (&_inner_error_);
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1789 "YouTubePublishing.c"
+#line 1792 "YouTubePublishing.c"
 	}
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = self->priv->authenticator;
+	_tmp7_ = self->priv->authenticator;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = builder;
+	_tmp9_ = builder;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = self->priv->publishing_parameters;
+	_tmp10_ = self->priv->publishing_parameters;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12_ = publishing_you_tube_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
+	_tmp11_ = publishing_you_tube_publishing_options_pane_new (_tmp7_, _tmp8_, _tmp9_, _tmp10_);
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	opts_pane = _tmp12_;
+	opts_pane = _tmp11_;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp13_ = opts_pane;
+	_tmp12_ = opts_pane;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0);
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = opts_pane;
+	_tmp13_ = opts_pane;
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0);
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = opts_pane;
+	_tmp15_ = opts_pane;
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	_tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE);
+	spit_publishing_plugin_host_set_service_locked (_tmp16_, FALSE);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (opts_pane);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (builder);
-#line 1825 "YouTubePublishing.c"
+#line 1828 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete);
-#line 1832 "YouTubePublishing.c"
+#line 1835 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	void* _tmp3_ = NULL;
-	GDestroyNotify _tmp4_ = NULL;
-	SpitPublishingProgressCallback _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	void* _tmp3_;
+	GDestroyNotify _tmp4_;
+	SpitPublishingProgressCallback _tmp5_;
+	gboolean _tmp6_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	SpitPublishingPublishable** _tmp9_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp7_;
+	gint _tmp8_;
+	SpitPublishingPublishable** _tmp9_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	PublishingYouTubeUploader* uploader = NULL;
-	GDataYouTubeService* _tmp10_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp11_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp12_ = NULL;
-	SpitPublishingPublishable** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	PublishingYouTubePublishingParameters* _tmp14_ = NULL;
-	PublishingYouTubeUploader* _tmp15_ = NULL;
-	PublishingYouTubeUploader* _tmp16_ = NULL;
-	PublishingYouTubeUploader* _tmp17_ = NULL;
-	PublishingYouTubeUploader* _tmp18_ = NULL;
-	PublishingYouTubeUploader* _tmp19_ = NULL;
+	GDataYouTubeService* _tmp10_;
+	PublishingRESTSupportGoogleSession* _tmp11_;
+	PublishingRESTSupportGoogleSession* _tmp12_;
+	SpitPublishingPublishable** _tmp13_;
+	gint _tmp13__length1;
+	PublishingYouTubePublishingParameters* _tmp14_;
+	PublishingYouTubeUploader* _tmp15_;
+	PublishingYouTubeUploader* _tmp16_;
+	PublishingYouTubeUploader* _tmp17_;
+	PublishingYouTubeUploader* _tmp18_;
+	PublishingYouTubeUploader* _tmp19_;
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1901,7 +1904,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
 	if (!_tmp6_) {
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1898 "YouTubePublishing.c"
+#line 1901 "YouTubePublishing.c"
 	}
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -1949,13 +1952,13 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1946 "YouTubePublishing.c"
+#line 1949 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1968,14 +1971,14 @@ static void publishing_you_tube_you_tube_publisher_do_show_success_pane (Publish
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 1965 "YouTubePublishing.c"
+#line 1968 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingAuthenticator* _tmp0_;
+	gboolean _tmp1_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1986,9 +1989,9 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES
 	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp1_) {
-#line 1983 "YouTubePublishing.c"
-		SpitPublishingAuthenticator* _tmp2_ = NULL;
-		SpitPublishingAuthenticator* _tmp3_ = NULL;
+#line 1986 "YouTubePublishing.c"
+		SpitPublishingAuthenticator* _tmp2_;
+		SpitPublishingAuthenticator* _tmp3_;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp2_ = self->priv->authenticator;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1997,7 +2000,7 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES
 		_tmp3_ = self->priv->authenticator;
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		spit_publishing_authenticator_authenticate (_tmp3_);
-#line 1994 "YouTubePublishing.c"
+#line 1997 "YouTubePublishing.c"
 	}
 }
 
@@ -2005,20 +2008,20 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES
 static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
 	SpitPublishingAuthenticator* result = NULL;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	SpitPublishingAuthenticator* _tmp5_ = NULL;
-	SpitPublishingAuthenticator* _tmp6_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
+	SpitPublishingAuthenticator* _tmp5_;
+	SpitPublishingAuthenticator* _tmp6_;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->authenticator;
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 2011 "YouTubePublishing.c"
-		PublishingAuthenticatorFactory* _tmp1_ = NULL;
-		PublishingAuthenticatorFactory* _tmp2_ = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 2014 "YouTubePublishing.c"
+		PublishingAuthenticatorFactory* _tmp1_;
+		PublishingAuthenticatorFactory* _tmp2_;
+		SpitPublishingPluginHost* _tmp3_;
+		SpitPublishingAuthenticator* _tmp4_;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp1_ = publishing_authenticator_factory_get_instance ();
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2033,7 +2036,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
 		self->priv->authenticator = _tmp4_;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2030 "YouTubePublishing.c"
+#line 2033 "YouTubePublishing.c"
 	}
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = self->priv->authenticator;
@@ -2043,7 +2046,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
 	result = _tmp6_;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2040 "YouTubePublishing.c"
+#line 2043 "YouTubePublishing.c"
 }
 
 
@@ -2053,31 +2056,31 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubePublisherPrivate));
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_is_running;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_is_running;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_start;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_start;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_stop;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_stop;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_on_login_flow_complete;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_on_login_flow_complete;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_do_logout;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_do_logout;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_get_authenticator;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_get_authenticator;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize;
-#line 2063 "YouTubePublishing.c"
+#line 2066 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) {
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self);
-#line 2070 "YouTubePublishing.c"
+#line 2073 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) {
+static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj) {
 	PublishingYouTubeYouTubePublisher * self;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
@@ -2097,7 +2100,7 @@ static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->youtube_service);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj);
-#line 2094 "YouTubePublishing.c"
+#line 2097 "YouTubePublishing.c"
 }
 
 
@@ -2116,78 +2119,77 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) {
 static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) {
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL;
-#line 2113 "YouTubePublishing.c"
+#line 2116 "YouTubePublishing.c"
 }
 
 
 static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) {
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 2120 "YouTubePublishing.c"
+#line 2123 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2127 "YouTubePublishing.c"
+#line 2130 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2134 "YouTubePublishing.c"
+#line 2137 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
 	PublishingYouTubePublishingOptionsPane * self = NULL;
-	gint _tmp0_ = 0;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-	GtkBuilder* _tmp4_ = NULL;
-	GtkBuilder* _tmp5_ = NULL;
-	GtkBuilder* _tmp6_ = NULL;
-	GtkBuilder* _tmp7_ = NULL;
-	GSList* _tmp8_ = NULL;
-	GSList* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
-	GtkBuilder* _tmp11_ = NULL;
-	GObject* _tmp12_ = NULL;
-	GtkLabel* _tmp13_ = NULL;
-	GtkBuilder* _tmp14_ = NULL;
-	GObject* _tmp15_ = NULL;
-	GtkComboBoxText* _tmp16_ = NULL;
-	GtkBuilder* _tmp17_ = NULL;
-	GObject* _tmp18_ = NULL;
-	GtkButton* _tmp19_ = NULL;
-	GtkBuilder* _tmp20_ = NULL;
-	GObject* _tmp21_ = NULL;
-	GtkButton* _tmp22_ = NULL;
-	GtkBuilder* _tmp23_ = NULL;
-	GObject* _tmp24_ = NULL;
-	GtkBox* _tmp25_ = NULL;
-	GtkBuilder* _tmp26_ = NULL;
-	GObject* _tmp27_ = NULL;
-	GtkLabel* _tmp28_ = NULL;
-	SpitPublishingAuthenticator* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	GtkLabel* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	GtkComboBoxText* _tmp47_ = NULL;
-	GtkLabel* _tmp48_ = NULL;
-	GtkComboBoxText* _tmp49_ = NULL;
-	GtkButton* _tmp50_ = NULL;
-	GtkButton* _tmp51_ = NULL;
+	gint _tmp0_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_;
+	PublishingYouTubePublishingParameters* _tmp2_;
+	PublishingYouTubePublishingParameters* _tmp3_;
+	GtkBuilder* _tmp4_;
+	GtkBuilder* _tmp5_;
+	GtkBuilder* _tmp6_;
+	GtkBuilder* _tmp7_;
+	GSList* _tmp8_;
+	GSList* _tmp9_;
+	guint _tmp10_;
+	GtkBuilder* _tmp11_;
+	GObject* _tmp12_;
+	GtkLabel* _tmp13_;
+	GtkBuilder* _tmp14_;
+	GObject* _tmp15_;
+	GtkComboBoxText* _tmp16_;
+	GtkBuilder* _tmp17_;
+	GObject* _tmp18_;
+	GtkButton* _tmp19_;
+	GtkBuilder* _tmp20_;
+	GObject* _tmp21_;
+	GtkButton* _tmp22_;
+	GtkBuilder* _tmp23_;
+	GObject* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkBuilder* _tmp26_;
+	GObject* _tmp27_;
+	GtkLabel* _tmp28_;
+	SpitPublishingAuthenticator* _tmp29_;
+	gboolean _tmp30_;
+	GtkLabel* _tmp35_;
+	PublishingYouTubePublishingParameters* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp41_;
+	gint _tmp41__length1;
+	GtkComboBoxText* _tmp46_;
+	GtkLabel* _tmp47_;
+	GtkComboBoxText* _tmp48_;
+	GtkButton* _tmp49_;
+	GtkButton* _tmp50_;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (authenticator), NULL);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2306,11 +2308,11 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 	_tmp30_ = spit_publishing_authenticator_can_logout (_tmp29_);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp30_) {
-#line 2303 "YouTubePublishing.c"
-		GtkButton* _tmp31_ = NULL;
-		GtkContainer* _tmp32_ = NULL;
-		GtkContainer* _tmp33_ = NULL;
-		GtkButton* _tmp34_ = NULL;
+#line 2305 "YouTubePublishing.c"
+		GtkButton* _tmp31_;
+		GtkContainer* _tmp32_;
+		GtkContainer* _tmp33_;
+		GtkButton* _tmp34_;
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp31_ = self->priv->logout_button;
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2321,32 +2323,30 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 		_tmp34_ = self->priv->logout_button;
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		gtk_container_remove (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 2318 "YouTubePublishing.c"
+#line 2320 "YouTubePublishing.c"
 	}
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp35_ = self->priv->login_identity_label;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp36_ = _ ("You are logged into YouTube as %s.");
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp37_ = publishing_parameters;
+	_tmp36_ = publishing_parameters;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp38_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp37_);
+	_tmp37_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp36_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp39_ = _tmp38_;
+	_tmp38_ = _tmp37_;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp40_ = g_strdup_printf (_tmp36_, _tmp39_);
+	_tmp39_ = g_strdup_printf (_ ("You are logged into YouTube as %s."), _tmp38_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp41_ = _tmp40_;
+	_tmp40_ = _tmp39_;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_label (_tmp35_, _tmp41_);
+	gtk_label_set_label (_tmp35_, _tmp40_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp41_);
+	_g_free0 (_tmp40_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp39_);
+	_g_free0 (_tmp38_);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp42_ = self->priv->privacy_descriptions;
+	_tmp41_ = self->priv->privacy_descriptions;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp42__length1 = self->priv->privacy_descriptions_length1;
+	_tmp41__length1 = self->priv->privacy_descriptions_length1;
 #line 2344 "YouTubePublishing.c"
 	{
 		PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
@@ -2354,31 +2354,31 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 		gint _desc_collection_size_ = 0;
 		gint desc_it = 0;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection = _tmp42_;
+		desc_collection = _tmp41_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection_length1 = _tmp42__length1;
+		desc_collection_length1 = _tmp41__length1;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		for (desc_it = 0; desc_it < _tmp42__length1; desc_it = desc_it + 1) {
+		for (desc_it = 0; desc_it < _tmp41__length1; desc_it = desc_it + 1) {
 #line 2356 "YouTubePublishing.c"
-			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp43_ = NULL;
+			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp42_;
 			PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp43_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
+			_tmp42_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			desc = _tmp43_;
+			desc = _tmp42_;
 #line 2363 "YouTubePublishing.c"
 			{
-				GtkComboBoxText* _tmp44_ = NULL;
-				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp45_ = NULL;
-				const gchar* _tmp46_ = NULL;
+				GtkComboBoxText* _tmp43_;
+				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp44_;
+				const gchar* _tmp45_;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp44_ = self->priv->privacy_combo;
+				_tmp43_ = self->priv->privacy_combo;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp45_ = desc;
+				_tmp44_ = desc;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp46_ = _tmp45_->description;
+				_tmp45_ = _tmp44_->description;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				gtk_combo_box_text_append_text (_tmp44_, _tmp46_);
+				gtk_combo_box_text_append_text (_tmp43_, _tmp45_);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc);
 #line 2378 "YouTubePublishing.c"
@@ -2386,23 +2386,23 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 		}
 	}
 #line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp47_ = self->priv->privacy_combo;
+	_tmp46_ = self->priv->privacy_combo;
 #line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48_ = self->priv->privacy_label;
+	_tmp47_ = self->priv->privacy_label;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp49_ = self->priv->privacy_combo;
+	_tmp48_ = self->priv->privacy_combo;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_mnemonic_widget (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+	gtk_label_set_mnemonic_widget (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp50_ = self->priv->logout_button;
+	_tmp49_ = self->priv->logout_button;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp49_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp51_ = self->priv->publish_button;
+	_tmp50_ = self->priv->publish_button;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
 #line 2402 "YouTubePublishing.c"
@@ -2417,13 +2417,13 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 
 
 static void publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self) {
-	PublishingYouTubePublishingParameters* _tmp0_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GtkComboBoxText* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_ = NULL;
-	PublishingYouTubePrivacySetting _tmp5_ = 0;
+	PublishingYouTubePublishingParameters* _tmp0_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_;
+	gint _tmp1__length1;
+	GtkComboBoxText* _tmp2_;
+	gint _tmp3_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_;
+	PublishingYouTubePrivacySetting _tmp5_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2443,7 +2443,7 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_emit_by_name (self, "publish");
+	g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
 #line 2441 "YouTubePublishing.c"
 }
 
@@ -2452,13 +2452,13 @@ static void publishing_you_tube_publishing_options_pane_on_logout_clicked (Publi
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_emit_by_name (self, "logout");
+	g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
 #line 2450 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self) {
-	GtkButton* _tmp0_ = NULL;
+	GtkButton* _tmp0_;
 #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2469,7 +2469,7 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se
 }
 
 
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2486,7 +2486,7 @@ static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2503,7 +2503,7 @@ static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2523,23 +2523,20 @@ static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self, int* result_length1) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** result = NULL;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _result_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp3_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp6_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp9_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_;
+	gint _tmp1__length1;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp2_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp3_;
+	gint _tmp3__length1;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp5_;
+	gint _tmp5__length1;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp6_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp7_;
+	gint _tmp7__length1;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2555,55 +2552,49 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = _ ("Public listed");
+	_tmp2_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public listed"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp2_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _result_;
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3_ = _result_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = _ ("Public unlisted");
+	_tmp3__length1 = _result__length1;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp5_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED);
+	_tmp4_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public unlisted"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = _result_;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5_ = _result_;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = _ ("Private");
+	_tmp5__length1 = _result__length1;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp8_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE);
+	_tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Private"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = _result_;
+	_tmp7_ = _result_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7__length1 = _result__length1;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (result_length1) {
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		*result_length1 = _tmp10__length1;
-#line 2585 "YouTubePublishing.c"
+		*result_length1 = _tmp7__length1;
+#line 2576 "YouTubePublishing.c"
 	}
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _tmp10_;
+	result = _tmp7_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2591 "YouTubePublishing.c"
+#line 2582 "YouTubePublishing.c"
 }
 
 
 static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingYouTubePublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkBox* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
+	GtkBox* _tmp0_;
+	GtkBox* _tmp1_;
+	GtkWidget* _tmp2_;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2618,7 +2609,7 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S
 	result = _tmp2_;
 #line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2615 "YouTubePublishing.c"
+#line 2606 "YouTubePublishing.c"
 }
 
 
@@ -2631,7 +2622,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_op
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2628 "YouTubePublishing.c"
+#line 2619 "YouTubePublishing.c"
 }
 
 
@@ -2641,7 +2632,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 2638 "YouTubePublishing.c"
+#line 2629 "YouTubePublishing.c"
 }
 
 
@@ -2649,15 +2640,15 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled
 	PublishingYouTubePublishingOptionsPane * self;
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 2646 "YouTubePublishing.c"
+#line 2637 "YouTubePublishing.c"
 }
 
 
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	PublishingYouTubePrivacySetting _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	PublishingYouTubePrivacySetting _tmp2_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2676,21 +2667,21 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_
 	self->privacy_setting = _tmp2_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 2673 "YouTubePublishing.c"
+#line 2664 "YouTubePublishing.c"
 }
 
 
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 2680 "YouTubePublishing.c"
+#line 2671 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2687 "YouTubePublishing.c"
+#line 2678 "YouTubePublishing.c"
 }
 
 
@@ -2699,7 +2690,7 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
 	if (value->data[0].v_pointer) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 2696 "YouTubePublishing.c"
+#line 2687 "YouTubePublishing.c"
 	}
 }
 
@@ -2709,11 +2700,11 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
 	if (src_value->data[0].v_pointer) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 2706 "YouTubePublishing.c"
+#line 2697 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2710 "YouTubePublishing.c"
+#line 2701 "YouTubePublishing.c"
 	}
 }
 
@@ -2721,66 +2712,66 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
 static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 2718 "YouTubePublishing.c"
+#line 2709 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2725 "YouTubePublishing.c"
-		PublishingYouTubePublishingOptionsPanePrivacyDescription* object;
+#line 2716 "YouTubePublishing.c"
+		PublishingYouTubePublishingOptionsPanePrivacyDescription * object;
 		object = collect_values[0].v_pointer;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2732 "YouTubePublishing.c"
+#line 2723 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2736 "YouTubePublishing.c"
+#line 2727 "YouTubePublishing.c"
 		}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object);
-#line 2740 "YouTubePublishing.c"
+#line 2731 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2744 "YouTubePublishing.c"
+#line 2735 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 2748 "YouTubePublishing.c"
+#line 2739 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** object_p;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2759 "YouTubePublishing.c"
+#line 2750 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 2765 "YouTubePublishing.c"
+#line 2756 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2769 "YouTubePublishing.c"
+#line 2760 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 2773 "YouTubePublishing.c"
+#line 2764 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 2777 "YouTubePublishing.c"
+#line 2768 "YouTubePublishing.c"
 }
 
 
@@ -2794,7 +2785,7 @@ static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privac
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2791 "YouTubePublishing.c"
+#line 2782 "YouTubePublishing.c"
 }
 
 
@@ -2803,12 +2794,12 @@ static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_de
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 2800 "YouTubePublishing.c"
+#line 2791 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* old;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription * old;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2823,23 +2814,23 @@ static void publishing_you_tube_publishing_options_pane_value_set_privacy_descri
 		value->data[0].v_pointer = v_object;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 2820 "YouTubePublishing.c"
+#line 2811 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2824 "YouTubePublishing.c"
+#line 2815 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 2830 "YouTubePublishing.c"
+#line 2821 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* old;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription * old;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2852,17 +2843,17 @@ static void publishing_you_tube_publishing_options_pane_value_take_privacy_descr
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2849 "YouTubePublishing.c"
+#line 2840 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2853 "YouTubePublishing.c"
+#line 2844 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 2859 "YouTubePublishing.c"
+#line 2850 "YouTubePublishing.c"
 	}
 }
 
@@ -2872,18 +2863,18 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_clas
 	publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize;
-#line 2869 "YouTubePublishing.c"
+#line 2860 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 2876 "YouTubePublishing.c"
+#line 2867 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription* obj) {
+static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingYouTubePublishingOptionsPanePrivacyDescription);
@@ -2891,7 +2882,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_fina
 	g_signal_handlers_destroy (self);
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
-#line 2888 "YouTubePublishing.c"
+#line 2879 "YouTubePublishing.c"
 }
 
 
@@ -2910,18 +2901,18 @@ static GType publishing_you_tube_publishing_options_pane_privacy_description_get
 
 
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance) {
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* self;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 2913 "YouTubePublishing.c"
+#line 2904 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance) {
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* self;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2929,7 +2920,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_unre
 		PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2926 "YouTubePublishing.c"
+#line 2917 "YouTubePublishing.c"
 	}
 }
 
@@ -2942,10 +2933,10 @@ static void publishing_you_tube_publishing_options_pane_class_init (PublishingYo
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_publishing_options_pane_finalize;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2942 "YouTubePublishing.c"
+	publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 2933 "YouTubePublishing.c"
 }
 
 
@@ -2953,14 +2944,14 @@ static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_p
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_get_widget;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_get_preferred_geometry;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled;
-#line 2957 "YouTubePublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled;
+#line 2948 "YouTubePublishing.c"
 }
 
 
@@ -2981,11 +2972,11 @@ static void publishing_you_tube_publishing_options_pane_instance_init (Publishin
 	self->priv->builder = NULL;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_label = NULL;
-#line 2978 "YouTubePublishing.c"
+#line 2969 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj) {
+static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj) {
 	PublishingYouTubePublishingOptionsPane * self;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
@@ -3009,7 +3000,7 @@ static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj)
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj);
-#line 3006 "YouTubePublishing.c"
+#line 2997 "YouTubePublishing.c"
 }
 
 
@@ -3029,17 +3020,17 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) {
 
 PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingYouTubeUploadTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	PublishingRESTSupportGoogleSession* _tmp3_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp4_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp5_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp6_ = NULL;
-	SpitPublishingPublishable* _tmp7_ = NULL;
-	SpitPublishingPublishable* _tmp8_ = NULL;
-	GDataYouTubeService* _tmp9_ = NULL;
-	GDataYouTubeService* _tmp10_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
+	gboolean _tmp2_;
+	PublishingRESTSupportGoogleSession* _tmp3_;
+	PublishingRESTSupportGoogleSession* _tmp4_;
+	PublishingYouTubePublishingParameters* _tmp5_;
+	PublishingYouTubePublishingParameters* _tmp6_;
+	SpitPublishingPublishable* _tmp7_;
+	SpitPublishingPublishable* _tmp8_;
+	GDataYouTubeService* _tmp9_;
+	GDataYouTubeService* _tmp10_;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3092,14 +3083,14 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const
 	self->priv->youtube_service = _tmp10_;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3089 "YouTubePublishing.c"
+#line 3080 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, youtube_service, session, parameters, publishable);
-#line 3096 "YouTubePublishing.c"
+#line 3087 "YouTubePublishing.c"
 }
 
 
@@ -3108,7 +3099,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
 	g_atomic_int_inc (&_data1_->_ref_count_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return _data1_;
-#line 3105 "YouTubePublishing.c"
+#line 3096 "YouTubePublishing.c"
 }
 
 
@@ -3117,7 +3108,7 @@ static void block1_data_unref (void * _userdata_) {
 	_data1_ = (Block1Data*) _userdata_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 3114 "YouTubePublishing.c"
+#line 3105 "YouTubePublishing.c"
 		PublishingYouTubeUploadTransaction* self;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		self = _data1_->self;
@@ -3127,14 +3118,14 @@ static void block1_data_unref (void * _userdata_) {
 		_publishing_rest_support_transaction_unref0 (self);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 3124 "YouTubePublishing.c"
+#line 3115 "YouTubePublishing.c"
 	}
 }
 
 
 static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 	PublishingYouTubeUploadTransaction* self;
-	GMainLoop* _tmp3_ = NULL;
+	GMainLoop* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = _data1_->self;
@@ -3142,16 +3133,16 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 	g_return_if_fail ((obj == NULL) || G_IS_OBJECT (obj));
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_IS_ASYNC_RESULT (res));
-#line 3139 "YouTubePublishing.c"
+#line 3130 "YouTubePublishing.c"
 	{
-		GAsyncResult* _tmp0_ = NULL;
+		GAsyncResult* _tmp0_;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp0_ = res;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_upload_transaction_splice_with_progress_finish (self, _tmp0_, &_inner_error_);
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3148 "YouTubePublishing.c"
+#line 3139 "YouTubePublishing.c"
 			goto __catch22_g_error;
 		}
 	}
@@ -3159,8 +3150,8 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 	__catch22_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		GError* _tmp1_;
+		const gchar* _tmp2_;
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_error_ = _inner_error_;
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3173,7 +3164,7 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 		g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp2_);
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (_error_);
-#line 3170 "YouTubePublishing.c"
+#line 3161 "YouTubePublishing.c"
 	}
 	__finally22:
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3184,13 +3175,13 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 		g_clear_error (&_inner_error_);
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 3181 "YouTubePublishing.c"
+#line 3172 "YouTubePublishing.c"
 	}
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _data1_->loop;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_main_loop_quit (_tmp3_);
-#line 3187 "YouTubePublishing.c"
+#line 3178 "YouTubePublishing.c"
 }
 
 
@@ -3199,31 +3190,31 @@ static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncRe
 	___lambda4_ (self, source_object, res);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	block1_data_unref (self);
-#line 3196 "YouTubePublishing.c"
+#line 3187 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingYouTubeUploadTransaction * self;
 	GDataYouTubeVideo* video = NULL;
-	GDataYouTubeVideo* _tmp0_ = NULL;
+	GDataYouTubeVideo* _tmp0_;
 	gchar* slug = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	SpitPublishingPublishable* _tmp1_;
+	gchar* _tmp2_;
 	gchar* title = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GDataYouTubeVideo* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	GDataYouTubeVideo* _tmp10_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp11_ = NULL;
-	PublishingYouTubePrivacySetting _tmp12_ = 0;
-	PublishingYouTubePublishingParameters* _tmp13_ = NULL;
-	PublishingYouTubePrivacySetting _tmp14_ = 0;
+	SpitPublishingPublishable* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	GDataYouTubeVideo* _tmp8_;
+	const gchar* _tmp9_;
+	GDataYouTubeVideo* _tmp10_;
+	PublishingYouTubePublishingParameters* _tmp11_;
+	PublishingYouTubePrivacySetting _tmp12_;
+	PublishingYouTubePublishingParameters* _tmp13_;
+	PublishingYouTubePrivacySetting _tmp14_;
 	GFile* file = NULL;
-	SpitPublishingPublishable* _tmp20_ = NULL;
-	GFile* _tmp21_ = NULL;
+	SpitPublishingPublishable* _tmp20_;
+	GFile* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
@@ -3247,9 +3238,9 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_tmp5_ = title;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_strcmp0 (_tmp5_, "") == 0) {
-#line 3244 "YouTubePublishing.c"
-		SpitPublishingPublishable* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 3235 "YouTubePublishing.c"
+		SpitPublishingPublishable* _tmp6_;
+		gchar* _tmp7_;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp6_ = self->priv->publishable;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3258,7 +3249,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_g_free0 (title);
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		title = _tmp7_;
-#line 3255 "YouTubePublishing.c"
+#line 3246 "YouTubePublishing.c"
 	}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = video;
@@ -3280,17 +3271,17 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_tmp14_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp13_);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp14_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
-#line 3277 "YouTubePublishing.c"
-		GDataYouTubeVideo* _tmp15_ = NULL;
+#line 3268 "YouTubePublishing.c"
+		GDataYouTubeVideo* _tmp15_;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp15_ = video;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		gdata_youtube_video_set_access_control (_tmp15_, "list", GDATA_YOUTUBE_PERMISSION_DENIED);
-#line 3283 "YouTubePublishing.c"
+#line 3274 "YouTubePublishing.c"
 	} else {
-		GDataYouTubeVideo* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
-		gboolean _tmp18_ = FALSE;
+		GDataYouTubeVideo* _tmp16_;
+		gboolean _tmp17_;
+		gboolean _tmp18_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp16_ = video;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3299,13 +3290,13 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_tmp18_ = _tmp17_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (!_tmp18_) {
-#line 3296 "YouTubePublishing.c"
-			GDataYouTubeVideo* _tmp19_ = NULL;
+#line 3287 "YouTubePublishing.c"
+			GDataYouTubeVideo* _tmp19_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_tmp19_ = video;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			gdata_youtube_video_set_access_control (_tmp19_, "list", GDATA_YOUTUBE_PERMISSION_ALLOWED);
-#line 3302 "YouTubePublishing.c"
+#line 3293 "YouTubePublishing.c"
 		}
 	}
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3314,32 +3305,32 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_tmp21_ = spit_publishing_publishable_get_serialized_file (_tmp20_);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	file = _tmp21_;
-#line 3311 "YouTubePublishing.c"
+#line 3302 "YouTubePublishing.c"
 	{
 		Block1Data* _data1_;
 		GFileInfo* info = NULL;
-		GFile* _tmp22_ = NULL;
-		GFileInfo* _tmp23_ = NULL;
+		GFile* _tmp22_;
+		GFileInfo* _tmp23_;
 		GDataUploadStream* upload_stream = NULL;
-		GDataYouTubeService* _tmp24_ = NULL;
-		GDataYouTubeVideo* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		GFileInfo* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GDataUploadStream* _tmp29_ = NULL;
+		GDataYouTubeService* _tmp24_;
+		GDataYouTubeVideo* _tmp25_;
+		const gchar* _tmp26_;
+		GFileInfo* _tmp27_;
+		const gchar* _tmp28_;
+		GDataUploadStream* _tmp29_;
 		GFileInputStream* input_stream = NULL;
-		GFile* _tmp30_ = NULL;
-		GFileInputStream* _tmp31_ = NULL;
-		GMainLoop* _tmp32_ = NULL;
-		GFileInfo* _tmp33_ = NULL;
-		GFileInputStream* _tmp34_ = NULL;
-		GDataUploadStream* _tmp35_ = NULL;
-		GMainLoop* _tmp36_ = NULL;
+		GFile* _tmp30_;
+		GFileInputStream* _tmp31_;
+		GMainLoop* _tmp32_;
+		GFileInfo* _tmp33_;
+		GFileInputStream* _tmp34_;
+		GDataUploadStream* _tmp35_;
+		GMainLoop* _tmp36_;
 		GDataYouTubeVideo* _tmp37_ = NULL;
-		GDataYouTubeService* _tmp38_ = NULL;
-		GDataUploadStream* _tmp39_ = NULL;
-		GDataYouTubeVideo* _tmp40_ = NULL;
-		GDataYouTubeVideo* _tmp41_ = NULL;
+		GDataYouTubeService* _tmp38_;
+		GDataUploadStream* _tmp39_;
+		GDataYouTubeVideo* _tmp40_;
+		GDataYouTubeVideo* _tmp41_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data1_ = g_slice_new0 (Block1Data);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3358,7 +3349,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			block1_data_unref (_data1_);
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
-#line 3355 "YouTubePublishing.c"
+#line 3346 "YouTubePublishing.c"
 			goto __catch21_g_error;
 		}
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3383,7 +3374,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			block1_data_unref (_data1_);
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
-#line 3380 "YouTubePublishing.c"
+#line 3371 "YouTubePublishing.c"
 			goto __catch21_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3402,7 +3393,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			block1_data_unref (_data1_);
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
-#line 3399 "YouTubePublishing.c"
+#line 3390 "YouTubePublishing.c"
 			goto __catch21_g_error;
 		}
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3441,7 +3432,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			block1_data_unref (_data1_);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
-#line 3438 "YouTubePublishing.c"
+#line 3429 "YouTubePublishing.c"
 			goto __catch21_g_error;
 		}
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3464,14 +3455,14 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		block1_data_unref (_data1_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data1_ = NULL;
-#line 3461 "YouTubePublishing.c"
+#line 3452 "YouTubePublishing.c"
 	}
 	goto __finally21;
 	__catch21_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
+		GError* _tmp42_;
+		const gchar* _tmp43_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_error_ = _inner_error_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3484,7 +3475,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp43_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (_error_);
-#line 3481 "YouTubePublishing.c"
+#line 3472 "YouTubePublishing.c"
 	}
 	__finally21:
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3503,7 +3494,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			_g_object_unref0 (video);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 3500 "YouTubePublishing.c"
+#line 3491 "YouTubePublishing.c"
 		} else {
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_object_unref0 (file);
@@ -3519,7 +3510,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			g_clear_error (&_inner_error_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 3516 "YouTubePublishing.c"
+#line 3507 "YouTubePublishing.c"
 		}
 	}
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3530,7 +3521,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_g_free0 (slug);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (video);
-#line 3527 "YouTubePublishing.c"
+#line 3518 "YouTubePublishing.c"
 }
 
 
@@ -3547,32 +3538,56 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_data_fre
 	_publishing_rest_support_transaction_unref0 (_data_->self);
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_slice_free (PublishingYouTubeUploadTransactionSpliceWithProgressData, _data_);
-#line 3544 "YouTubePublishing.c"
+#line 3535 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _task_data_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_task_data_ = g_task_get_task_data (G_TASK (res));
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_task_data_->_callback_ != NULL) {
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_task_data_->_callback_ (source_object, res, user_data);
+#line 3547 "YouTubePublishing.c"
+	}
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_task_data_->_task_complete_ = TRUE;
+#line 3551 "YouTubePublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 3551 "YouTubePublishing.c"
+#line 3558 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
-	PublishingYouTubeUploadTransaction* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
-	GInputStream* _tmp3_ = NULL;
-	GInputStream* _tmp4_ = NULL;
-	GOutputStream* _tmp5_ = NULL;
-	GOutputStream* _tmp6_ = NULL;
+	PublishingYouTubeUploadTransaction* _tmp0_;
+	GFileInfo* _tmp1_;
+	GFileInfo* _tmp2_;
+	GInputStream* _tmp3_;
+	GInputStream* _tmp4_;
+	GOutputStream* _tmp5_;
+	GOutputStream* _tmp6_;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_ = g_slice_new0 (PublishingYouTubeUploadTransactionSpliceWithProgressData);
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, publishing_you_tube_upload_transaction_splice_with_progress);
+	_data_->_callback_ = _callback_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_async_result = g_task_new (NULL, NULL, publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper, _user_data_);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_callback_ == NULL) {
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_task_complete_ = TRUE;
+#line 3581 "YouTubePublishing.c"
+	}
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free);
+	g_task_set_task_data (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free);
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = _publishing_rest_support_transaction_ref0 (self);
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3603,21 +3618,20 @@ static void publishing_you_tube_upload_transaction_splice_with_progress (Publish
 	_data_->output = _tmp6_;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
-#line 3600 "YouTubePublishing.c"
+#line 3615 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error) {
 	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) {
+	_data_ = g_task_propagate_pointer (G_TASK (_res_), error);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (NULL == _data_) {
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 3610 "YouTubePublishing.c"
+#line 3627 "YouTubePublishing.c"
 	}
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 3614 "YouTubePublishing.c"
 }
 
 
@@ -3630,8 +3644,10 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_ready (G
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_res_ = _res_;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_task_complete_ = TRUE;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
-#line 3628 "YouTubePublishing.c"
+#line 3644 "YouTubePublishing.c"
 }
 
 
@@ -3640,61 +3656,51 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 	switch (_data_->_state_) {
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 0:
-#line 3637 "YouTubePublishing.c"
+#line 3653 "YouTubePublishing.c"
 		goto _state_0;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 1:
-#line 3641 "YouTubePublishing.c"
+#line 3657 "YouTubePublishing.c"
 		goto _state_1;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 2:
-#line 3645 "YouTubePublishing.c"
+#line 3661 "YouTubePublishing.c"
 		goto _state_2;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 3:
-#line 3649 "YouTubePublishing.c"
+#line 3665 "YouTubePublishing.c"
 		goto _state_3;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 4:
-#line 3653 "YouTubePublishing.c"
+#line 3669 "YouTubePublishing.c"
 		goto _state_4;
 		default:
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_assert_not_reached ();
-#line 3658 "YouTubePublishing.c"
+#line 3674 "YouTubePublishing.c"
 	}
 	_state_0:
 #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->_tmp0_ = NULL;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_tmp0_ = _data_->info;
 #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->_tmp1_ = 0LL;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_tmp1_ = g_file_info_get_size (_data_->_tmp0_);
 #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->total_bytes = _data_->_tmp1_;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->_tmp2_ = 0LL;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_tmp2_ = _data_->total_bytes;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->bytes_to_write = _data_->_tmp2_;
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	while (TRUE) {
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp3_ = 0LL;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp3_ = _data_->bytes_to_write;
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (!(_data_->_tmp3_ > ((gint64) 0))) {
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			break;
-#line 3687 "YouTubePublishing.c"
+#line 3695 "YouTubePublishing.c"
 		}
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp4_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp4_ = _data_->input;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_state_ = 1;
@@ -3702,53 +3708,33 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 		g_input_stream_read_async (_data_->_tmp4_, _data_->buffer, (gsize) 8192, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return FALSE;
-#line 3699 "YouTubePublishing.c"
+#line 3705 "YouTubePublishing.c"
 		_state_1:
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp5_ = 0L;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp5_ = g_input_stream_read_finish (_data_->_tmp4_, _data_->_res_, &_data_->_inner_error_);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->bytes_read = _data_->_tmp5_;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_error_free (_data_->_inner_error_);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_data_->_state_ == 0) {
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3717 "YouTubePublishing.c"
-			} else {
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_simple_async_result_complete (_data_->_async_result);
-#line 3721 "YouTubePublishing.c"
-			}
+			g_task_return_error (_data_->_async_result, _data_->_inner_error_);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_object_unref (_data_->_async_result);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return FALSE;
-#line 3727 "YouTubePublishing.c"
+#line 3719 "YouTubePublishing.c"
 		}
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp6_ = 0L;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp6_ = _data_->bytes_read;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (_data_->_tmp6_ == ((gssize) 0)) {
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			break;
-#line 3737 "YouTubePublishing.c"
+#line 3727 "YouTubePublishing.c"
 		}
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp7_ = NULL;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp7_ = _data_->output;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp8_ = 0L;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp8_ = _data_->bytes_read;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_state_ = 2;
@@ -3756,65 +3742,39 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 		g_output_stream_write_async (_data_->_tmp7_, _data_->buffer + 0, (gsize) (((gint) _data_->_tmp8_) - 0), G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return FALSE;
-#line 3753 "YouTubePublishing.c"
+#line 3739 "YouTubePublishing.c"
 		_state_2:
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp9_ = 0L;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp9_ = g_output_stream_write_finish (_data_->_tmp7_, _data_->_res_, &_data_->_inner_error_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->bytes_written = _data_->_tmp9_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_error_free (_data_->_inner_error_);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_data_->_state_ == 0) {
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3771 "YouTubePublishing.c"
-			} else {
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_simple_async_result_complete (_data_->_async_result);
-#line 3775 "YouTubePublishing.c"
-			}
+			g_task_return_error (_data_->_async_result, _data_->_inner_error_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_object_unref (_data_->_async_result);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return FALSE;
-#line 3781 "YouTubePublishing.c"
+#line 3753 "YouTubePublishing.c"
 		}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp10_ = 0LL;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp10_ = _data_->bytes_to_write;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp11_ = 0L;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp11_ = _data_->bytes_written;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->bytes_to_write = _data_->_tmp10_ - _data_->_tmp11_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp12_ = 0LL;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp12_ = _data_->total_bytes;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp13_ = 0LL;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp13_ = _data_->bytes_to_write;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp14_ = 0LL;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_tmp14_ = _data_->total_bytes;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "chunk-transmitted", (gint) (_data_->_tmp12_ - _data_->_tmp13_), (gint) _data_->_tmp14_);
-#line 3807 "YouTubePublishing.c"
+#line 3769 "YouTubePublishing.c"
 	}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->_tmp15_ = NULL;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_tmp15_ = _data_->output;
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_state_ = 3;
@@ -3822,35 +3782,21 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 	g_output_stream_close_async (_data_->_tmp15_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return FALSE;
-#line 3819 "YouTubePublishing.c"
+#line 3779 "YouTubePublishing.c"
 	_state_3:
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_output_stream_close_finish (_data_->_tmp15_, _data_->_res_, &_data_->_inner_error_);
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_error_free (_data_->_inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (_data_->_state_ == 0) {
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3833 "YouTubePublishing.c"
-		} else {
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 3837 "YouTubePublishing.c"
-		}
+		g_task_return_error (_data_->_async_result, _data_->_inner_error_);
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_object_unref (_data_->_async_result);
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return FALSE;
-#line 3843 "YouTubePublishing.c"
+#line 3791 "YouTubePublishing.c"
 	}
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->_tmp16_ = NULL;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_tmp16_ = _data_->input;
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_data_->_state_ = 4;
@@ -3858,47 +3804,36 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 	g_input_stream_close_async (_data_->_tmp16_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return FALSE;
-#line 3855 "YouTubePublishing.c"
+#line 3801 "YouTubePublishing.c"
 	_state_4:
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_input_stream_close_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_);
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_error_free (_data_->_inner_error_);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (_data_->_state_ == 0) {
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3869 "YouTubePublishing.c"
-		} else {
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 3873 "YouTubePublishing.c"
-		}
+		g_task_return_error (_data_->_async_result, _data_->_inner_error_);
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_object_unref (_data_->_async_result);
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return FALSE;
-#line 3879 "YouTubePublishing.c"
+#line 3813 "YouTubePublishing.c"
 	}
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_data_->_state_ == 0) {
+	g_task_return_pointer (_data_->_async_result, _data_, NULL);
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3885 "YouTubePublishing.c"
-	} else {
+	if (_data_->_state_ != 0) {
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 3889 "YouTubePublishing.c"
+		while (_data_->_task_complete_ != TRUE) {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 3823 "YouTubePublishing.c"
+		}
 	}
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_object_unref (_data_->_async_result);
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return FALSE;
-#line 3895 "YouTubePublishing.c"
+#line 3830 "YouTubePublishing.c"
 }
 
 
@@ -3910,19 +3845,19 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate));
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_you_tube_upload_transaction_real_execute;
-#line 3908 "YouTubePublishing.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_you_tube_upload_transaction_real_execute;
+#line 3843 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) {
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 3915 "YouTubePublishing.c"
+#line 3850 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingYouTubeUploadTransaction * self;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
@@ -3936,7 +3871,7 @@ static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSuppo
 	_g_object_unref0 (self->priv->youtube_service);
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj);
-#line 3933 "YouTubePublishing.c"
+#line 3868 "YouTubePublishing.c"
 }
 
 
@@ -3954,13 +3889,13 @@ GType publishing_you_tube_upload_transaction_get_type (void) {
 
 PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
 	PublishingYouTubeUploader* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-	GDataYouTubeService* _tmp4_ = NULL;
-	GDataYouTubeService* _tmp5_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingYouTubePublishingParameters* _tmp2_;
+	PublishingYouTubePublishingParameters* _tmp3_;
+	GDataYouTubeService* _tmp4_;
+	GDataYouTubeService* _tmp5_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3993,28 +3928,28 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_
 	self->priv->youtube_service = _tmp5_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3990 "YouTubePublishing.c"
+#line 3925 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, youtube_service, session, publishables, publishables_length1, parameters);
-#line 3997 "YouTubePublishing.c"
+#line 3932 "YouTubePublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingYouTubeUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	GDataYouTubeService* _tmp0_ = NULL;
-	PublishingRESTSupportSession* _tmp1_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	SpitPublishingPublishable* _tmp5_ = NULL;
-	PublishingYouTubeUploadTransaction* _tmp6_ = NULL;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
+	GDataYouTubeService* _tmp0_;
+	PublishingRESTSupportSession* _tmp1_;
+	PublishingRESTSupportGoogleSession* _tmp2_;
+	PublishingYouTubePublishingParameters* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
+	SpitPublishingPublishable* _tmp5_;
+	PublishingYouTubeUploadTransaction* _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -4043,7 +3978,7 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat
 	result = _tmp7_;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 4040 "YouTubePublishing.c"
+#line 3975 "YouTubePublishing.c"
 }
 
 
@@ -4055,19 +3990,19 @@ static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderCl
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_you_tube_uploader_real_create_transaction;
-#line 4053 "YouTubePublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_you_tube_uploader_real_create_transaction;
+#line 3988 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 4060 "YouTubePublishing.c"
+#line 3995 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingYouTubeUploader * self;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
@@ -4077,7 +4012,7 @@ static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUpl
 	_g_object_unref0 (self->priv->youtube_service);
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj);
-#line 4074 "YouTubePublishing.c"
+#line 4009 "YouTubePublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index eca05dc..8d7d080 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing.c generated by valac 0.34.7, the Vala compiler
+/* shotwell-publishing.c generated by valac 0.36.6, the Vala compiler
  * generated from shotwell-publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -98,7 +98,7 @@ struct _ShotwellPublishingCoreServicesPrivate {
 
 
 static gpointer shotwell_publishing_core_services_parent_class = NULL;
-static SpitModuleIface* shotwell_publishing_core_services_spit_module_parent_iface = NULL;
+static SpitModuleIface * shotwell_publishing_core_services_spit_module_parent_iface = NULL;
 
 GType shotwell_publishing_core_services_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServicesPrivate))
@@ -110,34 +110,34 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 FacebookService* facebook_service_new (GFile* resource_directory);
 FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory);
 GType facebook_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 PicasaService* picasa_service_new (GFile* resource_directory);
 PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory);
 GType picasa_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 FlickrService* flickr_service_new (GFile* resource_directory);
 FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory);
 GType flickr_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 YouTubeService* you_tube_service_new (GFile* resource_directory);
 YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory);
 GType you_tube_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 PiwigoService* piwigo_service_new (GFile* resource_directory);
 PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory);
 GType piwigo_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base);
 static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1);
-static void shotwell_publishing_core_services_finalize (GObject* obj);
+static void shotwell_publishing_core_services_finalize (GObject * obj);
 SpitModule* spit_entry_point (SpitEntryPointParams* params);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -154,7 +154,7 @@ static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -171,7 +171,7 @@ static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -188,7 +188,7 @@ static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -205,7 +205,7 @@ static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -225,31 +225,31 @@ static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, Sp
 ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file) {
 	ShotwellPublishingCoreServices * self = NULL;
 	GFile* resource_directory = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 	PublishingAuthenticatorFactory* factory = NULL;
-	PublishingAuthenticatorFactory* _tmp2_ = NULL;
+	PublishingAuthenticatorFactory* _tmp2_;
 	GeeList* authenicators = NULL;
-	PublishingAuthenticatorFactory* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GeeList* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	GeeList* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	GeeList* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	GeeList* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	GeeList* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
-	SpitPluggable** _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	GFile* _tmp32_ = NULL;
-	PiwigoService* _tmp33_ = NULL;
+	PublishingAuthenticatorFactory* _tmp3_;
+	GeeList* _tmp4_;
+	GFile* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GeeList* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
+	GeeList* _tmp11_;
+	gboolean _tmp12_;
+	GeeList* _tmp16_;
+	gboolean _tmp17_;
+	GeeList* _tmp21_;
+	gboolean _tmp22_;
+	GeeList* _tmp26_;
+	gboolean _tmp27_;
+	SpitPluggable** _tmp31_;
+	gint _tmp31__length1;
+	GFile* _tmp32_;
+	PiwigoService* _tmp33_;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -295,10 +295,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp12_) {
 #line 298 "shotwell-publishing.c"
-		SpitPluggable** _tmp13_ = NULL;
-		gint _tmp13__length1 = 0;
-		GFile* _tmp14_ = NULL;
-		FacebookService* _tmp15_ = NULL;
+		SpitPluggable** _tmp13_;
+		gint _tmp13__length1;
+		GFile* _tmp14_;
+		FacebookService* _tmp15_;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp13_ = self->priv->pluggables;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -318,10 +318,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp17_) {
 #line 321 "shotwell-publishing.c"
-		SpitPluggable** _tmp18_ = NULL;
-		gint _tmp18__length1 = 0;
-		GFile* _tmp19_ = NULL;
-		PicasaService* _tmp20_ = NULL;
+		SpitPluggable** _tmp18_;
+		gint _tmp18__length1;
+		GFile* _tmp19_;
+		PicasaService* _tmp20_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp18_ = self->priv->pluggables;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -341,10 +341,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp22_) {
 #line 344 "shotwell-publishing.c"
-		SpitPluggable** _tmp23_ = NULL;
-		gint _tmp23__length1 = 0;
-		GFile* _tmp24_ = NULL;
-		FlickrService* _tmp25_ = NULL;
+		SpitPluggable** _tmp23_;
+		gint _tmp23__length1;
+		GFile* _tmp24_;
+		FlickrService* _tmp25_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp23_ = self->priv->pluggables;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -364,10 +364,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp27_) {
 #line 367 "shotwell-publishing.c"
-		SpitPluggable** _tmp28_ = NULL;
-		gint _tmp28__length1 = 0;
-		GFile* _tmp29_ = NULL;
-		YouTubeService* _tmp30_ = NULL;
+		SpitPluggable** _tmp28_;
+		gint _tmp28__length1;
+		GFile* _tmp29_;
+		YouTubeService* _tmp30_;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp28_ = self->priv->pluggables;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -412,16 +412,13 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* mo
 static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp0_ = _ ("Core Publishing Services");
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	result = _tmp0_;
+	result = _ ("Core Publishing Services");
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 425 "shotwell-publishing.c"
+#line 422 "shotwell-publishing.c"
 }
 
 
@@ -434,7 +431,7 @@ static const gchar* shotwell_publishing_core_services_real_get_version (SpitModu
 	result = _VERSION;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 438 "shotwell-publishing.c"
+#line 435 "shotwell-publishing.c"
 }
 
 
@@ -447,17 +444,17 @@ static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* b
 	result = "org.yorba.shotwell.publishing.core_services";
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 451 "shotwell-publishing.c"
+#line 448 "shotwell-publishing.c"
 }
 
 
 static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1) {
 	ShotwellPublishingCoreServices * self;
 	SpitPluggable** result = NULL;
-	SpitPluggable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPluggable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitPluggable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPluggable** _tmp1_;
+	gint _tmp1__length1;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -472,13 +469,13 @@ static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (Sp
 	if (result_length1) {
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 476 "shotwell-publishing.c"
+#line 473 "shotwell-publishing.c"
 	}
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp1_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 482 "shotwell-publishing.c"
+#line 479 "shotwell-publishing.c"
 }
 
 
@@ -489,7 +486,7 @@ static void shotwell_publishing_core_services_class_init (ShotwellPublishingCore
 	g_type_class_add_private (klass, sizeof (ShotwellPublishingCoreServicesPrivate));
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_core_services_finalize;
-#line 493 "shotwell-publishing.c"
+#line 490 "shotwell-publishing.c"
 }
 
 
@@ -497,19 +494,19 @@ static void shotwell_publishing_core_services_spit_module_interface_init (SpitMo
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	shotwell_publishing_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_module_name;
+	iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_module_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_version;
+	iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_version;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_core_services_real_get_pluggables;
-#line 508 "shotwell-publishing.c"
+	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_core_services_real_get_pluggables;
+#line 505 "shotwell-publishing.c"
 }
 
 
 static void shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self) {
-	SpitPluggable** _tmp0_ = NULL;
+	SpitPluggable** _tmp0_;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self->priv = SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE (self);
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -520,11 +517,11 @@ static void shotwell_publishing_core_services_instance_init (ShotwellPublishingC
 	self->priv->pluggables_length1 = 0;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 524 "shotwell-publishing.c"
+#line 521 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_finalize (GObject* obj) {
+static void shotwell_publishing_core_services_finalize (GObject * obj) {
 	ShotwellPublishingCoreServices * self;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
@@ -532,7 +529,7 @@ static void shotwell_publishing_core_services_finalize (GObject* obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (shotwell_publishing_core_services_parent_class)->finalize (obj);
-#line 536 "shotwell-publishing.c"
+#line 533 "shotwell-publishing.c"
 }
 
 
@@ -552,14 +549,14 @@ GType shotwell_publishing_core_services_get_type (void) {
 
 SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	SpitModule* result = NULL;
-	SpitEntryPointParams* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	SpitEntryPointParams* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	SpitEntryPointParams* _tmp0_;
+	gint _tmp1_;
+	SpitEntryPointParams* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	ShotwellPublishingCoreServices* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	SpitEntryPointParams* _tmp6_;
+	gint _tmp7_;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = params;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -578,10 +575,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	_tmp7_ = (*_tmp6_).module_spit_interface;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 582 "shotwell-publishing.c"
-		SpitEntryPointParams* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		ShotwellPublishingCoreServices* _tmp10_ = NULL;
+#line 579 "shotwell-publishing.c"
+		SpitEntryPointParams* _tmp8_;
+		GFile* _tmp9_;
+		ShotwellPublishingCoreServices* _tmp10_;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp8_ = params;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -592,19 +589,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 		_g_object_unref0 (_tmp5_);
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = _tmp10_;
-#line 596 "shotwell-publishing.c"
+#line 593 "shotwell-publishing.c"
 	} else {
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_g_object_unref0 (_tmp5_);
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = NULL;
-#line 602 "shotwell-publishing.c"
+#line 599 "shotwell-publishing.c"
 	}
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 608 "shotwell-publishing.c"
+#line 605 "shotwell-publishing.c"
 }
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-12-15 20:38:57 +0100
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-12-15 20:38:57 +0100
commit	f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
tree	a1f2ab30332a6383b0677bfcc2aec687b98851d6 /plugins/shotwell-publishing
parent	f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parent	ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)